summaryrefslogtreecommitdiff
path: root/src/Photo.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/Photo.c
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/Photo.c')
-rw-r--r--src/Photo.c17128
1 files changed, 8553 insertions, 8575 deletions
diff --git a/src/Photo.c b/src/Photo.c
index dffc7d4..1704070 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.34.7, the Vala compiler
+/* Photo.c generated by valac 0.36.6, the Vala compiler
* generated from Photo.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -84,6 +84,11 @@ typedef struct _ParamSpecPhotoImportParams ParamSpecPhotoImportParams;
typedef struct _PhotoTransformationState PhotoTransformationState;
typedef struct _PhotoTransformationStateClass PhotoTransformationStateClass;
typedef struct _PhotoTransformationStatePrivate PhotoTransformationStatePrivate;
+enum {
+ PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL,
+ PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL
+};
+static guint photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_LAST_SIGNAL] = {0};
#define TYPE_RATING (rating_get_type ())
@@ -649,6 +654,17 @@ typedef struct _PhotoParamSpecReimportMasterState PhotoParamSpecReimportMasterSt
typedef struct _PhotoParamSpecReimportEditableState PhotoParamSpecReimportEditableState;
typedef struct _PhotoParamSpecReimportRawDevelopmentState PhotoParamSpecReimportRawDevelopmentState;
typedef struct _PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport;
+enum {
+ PHOTO_EDITABLE_REPLACED_SIGNAL,
+ PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL,
+ PHOTO_BASELINE_REPLACED_SIGNAL,
+ PHOTO_MASTER_REIMPORTED_SIGNAL,
+ PHOTO_EDITABLE_REIMPORTED_SIGNAL,
+ PHOTO_BASELINE_REIMPORTED_SIGNAL,
+ PHOTO_SOURCE_REIMPORTED_SIGNAL,
+ PHOTO_LAST_SIGNAL
+};
+static guint photo_signals[PHOTO_LAST_SIGNAL] = {0};
typedef struct _DataCollectionPrivate DataCollectionPrivate;
#define TYPE_MARKER (marker_get_type ())
@@ -807,6 +823,14 @@ typedef struct _HierarchicalTagIndexClass HierarchicalTagIndexClass;
typedef struct _MediaSourceTransactionController MediaSourceTransactionController;
typedef struct _MediaSourceTransactionControllerClass MediaSourceTransactionControllerClass;
+enum {
+ LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL,
+ LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL,
+ LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL,
+ LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL,
+ LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL
+};
+static guint library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_LAST_SIGNAL] = {0};
#define TYPE_FLAGGABLE (flaggable_get_type ())
#define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable))
@@ -1759,14 +1783,14 @@ static gpointer photo_reimport_editable_state_impl_parent_class = NULL;
static gpointer photo_reimport_raw_development_state_parent_class = NULL;
static gpointer photo_reimport_raw_development_state_impl_parent_class = NULL;
static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = NULL;
-static DateableIface* photo_dateable_parent_iface = NULL;
+static DateableIface * photo_dateable_parent_iface = NULL;
static gpointer library_photo_source_collection_parent_class = NULL;
static gpointer library_photo_parent_class = NULL;
extern LibraryPhotoSourceCollection* library_photo_global;
LibraryPhotoSourceCollection* library_photo_global = NULL;
extern TagSourceCollection* tag_global;
-static FlaggableIface* library_photo_flaggable_parent_iface = NULL;
-static MonitorableIface* library_photo_monitorable_parent_iface = NULL;
+static FlaggableIface * library_photo_flaggable_parent_iface = NULL;
+static MonitorableIface * library_photo_monitorable_parent_iface = NULL;
static gpointer library_photo_source_holding_tank_parent_class = NULL;
GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
@@ -1804,7 +1828,7 @@ PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated
PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails);
PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id);
PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id);
-static void photo_import_params_finalize (PhotoImportParams* obj);
+static void photo_import_params_finalize (PhotoImportParams * obj);
GType photo_transformation_state_get_type (void) G_GNUC_CONST;
#define PHOTO_TRANSFORMATION_STATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationStatePrivate))
enum {
@@ -1813,7 +1837,7 @@ enum {
PhotoTransformationState* photo_transformation_state_construct (GType object_type);
gboolean photo_transformation_state_is_broken (PhotoTransformationState* self);
static void photo_transformation_state_real_broken (PhotoTransformationState* self);
-static void photo_transformation_state_finalize (GObject* obj);
+static void photo_transformation_state_finalize (GObject * obj);
GType rating_get_type (void) G_GNUC_CONST;
gboolean rating_can_increase (Rating self);
gboolean rating_can_decrease (Rating self);
@@ -2087,12 +2111,12 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d);
static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1);
BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5);
BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5);
-static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
gboolean photo_has_editable (Photo* self);
-static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
gboolean photo_is_developed (Photo* self);
GeeCollection* photo_get_raw_development_photo_rows (Photo* self);
-static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode);
static PhotoFileReader* photo_get_master_reader (Photo* self);
static PhotoFileReader* photo_get_baseline_reader (Photo* self);
@@ -2151,7 +2175,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
ImportResult import_result_convert_error (GError* err, ImportResult default_result);
void photo_create_pre_import (PhotoImportParams* params);
void dimensions_init (Dimensions *self, gint width, gint height);
-BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation** detected, GError** error);
+BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error);
gpointer photo_reimport_master_state_ref (gpointer instance);
void photo_reimport_master_state_unref (gpointer instance);
GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -2159,13 +2183,13 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object);
void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
gpointer photo_value_get_reimport_master_state (const GValue* value);
GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error);
-static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value);
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
+static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value);
static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
@@ -2174,11 +2198,11 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error);
void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from);
-static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value);
Alteration* alteration_new_from_array (gchar** array, int array_length1);
Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1);
-static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow** backing, DetectedPhotoInformation** detected, GError** error);
+static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error);
gpointer photo_reimport_editable_state_ref (gpointer instance);
void photo_reimport_editable_state_unref (gpointer instance);
GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -2186,7 +2210,7 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object);
void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object);
gpointer photo_value_get_reimport_editable_state (const GValue* value);
GType photo_reimport_editable_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState** state, GError** error);
+gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error);
GFile* photo_get_editable_file (Photo* self);
static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata);
static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata);
@@ -2207,7 +2231,7 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o
void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object);
gpointer photo_value_get_reimport_raw_development_state (const GValue* value);
GType photo_reimport_raw_development_state_get_type (void) G_GNUC_CONST;
-gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState** state, GError** error);
+gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error);
GeeCollection* photo_get_raw_developer_files (Photo* self);
static GType photo_reimport_raw_development_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void);
@@ -2243,7 +2267,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result);
static gboolean photo_is_extension_found (const gchar* basename, gchar** extensions, int extensions_length1);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format);
PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1);
@@ -2254,15 +2278,15 @@ static GFile* photo_real_get_file (MediaSource* base);
void photo_set_master_file (Photo* self, GFile* file);
void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error);
void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file);
-static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value);
void photo_set_editable_file (Photo* self, GFile* file);
void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error);
-static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value);
void photo_set_many_editable_file (GeeMap* map, GError** error);
GFile* photo_get_actual_file (Photo* self);
static GFile* photo_real_get_master_file (MediaSource* base);
@@ -2379,9 +2403,9 @@ PixelTransformationType pixel_transformation_get_transformation_type (PixelTrans
static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans);
static PhotoMetadata* photo_real_get_metadata (PhotoSource* base);
PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error);
-gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState** state, GError** error);
+gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error);
void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error);
-gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState** state, GError** error);
+gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error);
void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error);
gboolean photo_has_transformations (Photo* self);
gboolean photo_only_metadata_changed (Photo* self);
@@ -2515,12 +2539,12 @@ static void photo_update_editable_attributes (Photo* self, GError** error);
void photo_reimport_editable (Photo* self, GError** error);
void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error);
void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error);
-static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value);
void backing_photo_id_init (BackingPhotoID *self, gint64 id);
const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self);
static void photo_on_reimport_editable (Photo* self);
@@ -2561,39 +2585,39 @@ enum {
static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self);
static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self);
static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original);
-static void photo_photo_transformation_state_impl_finalize (GObject* obj);
+static void photo_photo_transformation_state_impl_finalize (GObject * obj);
enum {
PHOTO_BACKING_READERS_DUMMY_PROPERTY
};
-static void photo_backing_readers_finalize (PhotoBackingReaders* obj);
+static void photo_backing_readers_finalize (PhotoBackingReaders * obj);
enum {
PHOTO_CACHED_PIXBUF_DUMMY_PROPERTY
};
-static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj);
+static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj);
enum {
PHOTO_REIMPORT_MASTER_STATE_DUMMY_PROPERTY
};
PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type);
-static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj);
+static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj);
enum {
PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY
};
static gchar** _vala_array_dup28 (gchar** self, int length);
-static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj);
+static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj);
enum {
PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY
};
PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type);
-static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj);
+static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj);
enum {
PHOTO_REIMPORT_EDITABLE_STATE_IMPL_DUMMY_PROPERTY
};
-static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj);
+static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj);
enum {
PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_DUMMY_PROPERTY
};
PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type);
-static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj);
+static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj);
enum {
PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DUMMY_PROPERTY
};
@@ -2602,9 +2626,9 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
enum {
PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_DUMMY_PROPERTY
};
-static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj);
-static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj);
-static void photo_finalize (GObject* obj);
+static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj);
+static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj);
+static void photo_finalize (GObject * obj);
static void _vala_photo_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void _vala_photo_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
GType marker_get_type (void) G_GNUC_CONST;
@@ -2758,7 +2782,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata);
static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata);
static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata);
-static void library_photo_source_collection_finalize (DataCollection* obj);
+static void library_photo_source_collection_finalize (DataCollection * obj);
GType flaggable_get_type (void) G_GNUC_CONST;
GType monitorable_get_type (void) G_GNUC_CONST;
#define LIBRARY_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO, LibraryPhotoPrivate))
@@ -2784,7 +2808,7 @@ GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* ob
void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources);
void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources);
void library_photo_terminate (void);
-ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto** photo);
+ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo);
void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result);
gboolean photo_id_is_invalid (PhotoID *self);
void library_photo_import_failed (LibraryPhoto* photo);
@@ -2850,7 +2874,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name);
gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root);
-static void library_photo_finalize (GObject* obj);
+static void library_photo_finalize (GObject * obj);
#define LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTankPrivate))
enum {
LIBRARY_PHOTO_SOURCE_HOLDING_TANK_DUMMY_PROPERTY
@@ -2863,7 +2887,7 @@ static void _library_photo_source_holding_tank_on_editable_replaced_photo_editab
static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo);
static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self);
void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed);
-static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj);
+static void library_photo_source_holding_tank_finalize (SourceHoldingTank * 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);
@@ -2884,33 +2908,33 @@ GType backing_fetch_mode_get_type (void) {
static gpointer _g_object_ref0 (gpointer self) {
#line 41 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? g_object_ref (self) : NULL;
-#line 2888 "Photo.c"
+#line 2912 "Photo.c"
}
static gpointer _thumbnails_ref0 (gpointer self) {
#line 48 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? thumbnails_ref (self) : NULL;
-#line 2895 "Photo.c"
+#line 2919 "Photo.c"
}
PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) {
PhotoImportParams* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- ImportID _tmp4_ = {0};
- PhotoFileSnifferOptions _tmp5_ = 0;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- Thumbnails* _tmp12_ = NULL;
- Thumbnails* _tmp13_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
+ ImportID _tmp4_;
+ PhotoFileSnifferOptions _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ const gchar* _tmp10_;
+ gchar* _tmp11_;
+ Thumbnails* _tmp12_;
+ Thumbnails* _tmp13_;
#line 38 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 38 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -2979,22 +3003,22 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file
self->thumbnails = _tmp13_;
#line 38 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 2983 "Photo.c"
+#line 3007 "Photo.c"
}
PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) {
#line 38 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_import_params_construct (TYPE_PHOTO_IMPORT_PARAMS, file, final_associated_file, import_id, sniffer_options, exif_md5, thumbnail_md5, full_md5, thumbnails);
-#line 2990 "Photo.c"
+#line 3014 "Photo.c"
}
PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id) {
PhotoImportParams* self = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- ImportID _tmp2_ = {0};
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ ImportID _tmp2_;
#line 52 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 52 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3033,21 +3057,21 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec
self->thumbnails = NULL;
#line 52 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 3037 "Photo.c"
+#line 3061 "Photo.c"
}
PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) {
#line 52 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_import_params_construct_create_placeholder (TYPE_PHOTO_IMPORT_PARAMS, file, import_id);
-#line 3044 "Photo.c"
+#line 3068 "Photo.c"
}
static void value_photo_import_params_init (GValue* value) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 3051 "Photo.c"
+#line 3075 "Photo.c"
}
@@ -3056,7 +3080,7 @@ static void value_photo_import_params_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
photo_import_params_unref (value->data[0].v_pointer);
-#line 3060 "Photo.c"
+#line 3084 "Photo.c"
}
}
@@ -3066,11 +3090,11 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
if (src_value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_import_params_ref (src_value->data[0].v_pointer);
-#line 3070 "Photo.c"
+#line 3094 "Photo.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3074 "Photo.c"
+#line 3098 "Photo.c"
}
}
@@ -3078,66 +3102,66 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
static gpointer value_photo_import_params_peek_pointer (const GValue* value) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 3082 "Photo.c"
+#line 3106 "Photo.c"
}
static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 3089 "Photo.c"
- PhotoImportParams* object;
+#line 3113 "Photo.c"
+ PhotoImportParams * object;
object = collect_values[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3096 "Photo.c"
+#line 3120 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 21 "/home/jens/Source/shotwell/src/Photo.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 3100 "Photo.c"
+#line 3124 "Photo.c"
}
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_import_params_ref (object);
-#line 3104 "Photo.c"
+#line 3128 "Photo.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 3108 "Photo.c"
+#line 3132 "Photo.c"
}
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 3112 "Photo.c"
+#line 3136 "Photo.c"
}
static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoImportParams** object_p;
+ PhotoImportParams ** object_p;
object_p = collect_values[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3123 "Photo.c"
+#line 3147 "Photo.c"
}
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 3129 "Photo.c"
+#line 3153 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 3133 "Photo.c"
+#line 3157 "Photo.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_import_params_ref (value->data[0].v_pointer);
-#line 3137 "Photo.c"
+#line 3161 "Photo.c"
}
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 3141 "Photo.c"
+#line 3165 "Photo.c"
}
@@ -3151,7 +3175,7 @@ GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick
G_PARAM_SPEC (spec)->value_type = object_type;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 3155 "Photo.c"
+#line 3179 "Photo.c"
}
@@ -3160,12 +3184,12 @@ gpointer value_get_photo_import_params (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS), NULL);
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 3164 "Photo.c"
+#line 3188 "Photo.c"
}
void value_set_photo_import_params (GValue* value, gpointer v_object) {
- PhotoImportParams* old;
+ PhotoImportParams * old;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS));
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3180,23 +3204,23 @@ void value_set_photo_import_params (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
photo_import_params_ref (value->data[0].v_pointer);
-#line 3184 "Photo.c"
+#line 3208 "Photo.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 3188 "Photo.c"
+#line 3212 "Photo.c"
}
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
photo_import_params_unref (old);
-#line 3194 "Photo.c"
+#line 3218 "Photo.c"
}
}
void value_take_photo_import_params (GValue* value, gpointer v_object) {
- PhotoImportParams* old;
+ PhotoImportParams * old;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS));
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3209,17 +3233,17 @@ void value_take_photo_import_params (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/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 3213 "Photo.c"
+#line 3237 "Photo.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 3217 "Photo.c"
+#line 3241 "Photo.c"
}
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
photo_import_params_unref (old);
-#line 3223 "Photo.c"
+#line 3247 "Photo.c"
}
}
@@ -3229,12 +3253,12 @@ static void photo_import_params_class_init (PhotoImportParamsClass * klass) {
photo_import_params_parent_class = g_type_class_peek_parent (klass);
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoImportParamsClass *) klass)->finalize = photo_import_params_finalize;
-#line 3233 "Photo.c"
+#line 3257 "Photo.c"
}
static void photo_import_params_instance_init (PhotoImportParams * self) {
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 24 "/home/jens/Source/shotwell/src/Photo.vala"
self->final_associated_file = NULL;
#line 35 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3245,11 +3269,11 @@ static void photo_import_params_instance_init (PhotoImportParams * self) {
self->keywords = NULL;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 3249 "Photo.c"
+#line 3273 "Photo.c"
}
-static void photo_import_params_finalize (PhotoImportParams* obj) {
+static void photo_import_params_finalize (PhotoImportParams * obj) {
PhotoImportParams * self;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_PARAMS, PhotoImportParams);
@@ -3271,7 +3295,7 @@ static void photo_import_params_finalize (PhotoImportParams* obj) {
_photo_row_unref0 (self->row);
#line 36 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (self->keywords);
-#line 3275 "Photo.c"
+#line 3299 "Photo.c"
}
@@ -3290,18 +3314,18 @@ GType photo_import_params_get_type (void) {
gpointer photo_import_params_ref (gpointer instance) {
- PhotoImportParams* self;
+ PhotoImportParams * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 3300 "Photo.c"
+#line 3324 "Photo.c"
}
void photo_import_params_unref (gpointer instance) {
- PhotoImportParams* self;
+ PhotoImportParams * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3309,7 +3333,7 @@ void photo_import_params_unref (gpointer instance) {
PHOTO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
#line 21 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3313 "Photo.c"
+#line 3337 "Photo.c"
}
}
@@ -3320,13 +3344,13 @@ PhotoTransformationState* photo_transformation_state_construct (GType object_typ
self = (PhotoTransformationState*) g_object_new (object_type, NULL);
#line 72 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 3324 "Photo.c"
+#line 3348 "Photo.c"
}
gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 75 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (self), FALSE);
#line 76 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3335,14 +3359,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
result = _tmp0_;
#line 76 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3339 "Photo.c"
+#line 3363 "Photo.c"
}
static void photo_transformation_state_real_broken (PhotoTransformationState* self) {
#line 69 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->is_broke = TRUE;
-#line 3346 "Photo.c"
+#line 3370 "Photo.c"
}
@@ -3356,8 +3380,8 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass
#line 63 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize;
#line 63 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3361 "Photo.c"
+ photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3385 "Photo.c"
}
@@ -3366,17 +3390,17 @@ static void photo_transformation_state_instance_init (PhotoTransformationState *
self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self);
#line 64 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->is_broke = FALSE;
-#line 3370 "Photo.c"
+#line 3394 "Photo.c"
}
-static void photo_transformation_state_finalize (GObject* obj) {
+static void photo_transformation_state_finalize (GObject * obj) {
PhotoTransformationState * self;
#line 63 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
#line 63 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (photo_transformation_state_parent_class)->finalize (obj);
-#line 3380 "Photo.c"
+#line 3404 "Photo.c"
}
@@ -3398,7 +3422,7 @@ gboolean rating_can_increase (Rating self) {
result = self < RATING_FIVE;
#line 90 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3402 "Photo.c"
+#line 3426 "Photo.c"
}
@@ -3408,7 +3432,7 @@ gboolean rating_can_decrease (Rating self) {
result = self > RATING_REJECTED;
#line 94 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3412 "Photo.c"
+#line 3436 "Photo.c"
}
@@ -3419,65 +3443,65 @@ gboolean rating_is_valid (Rating self) {
if (self >= RATING_REJECTED) {
#line 98 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self <= RATING_FIVE;
-#line 3423 "Photo.c"
+#line 3447 "Photo.c"
} else {
#line 98 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = FALSE;
-#line 3427 "Photo.c"
+#line 3451 "Photo.c"
}
#line 98 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 98 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3433 "Photo.c"
+#line 3457 "Photo.c"
}
Rating rating_increase (Rating self) {
Rating result = 0;
Rating _tmp0_ = 0;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 102 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = rating_can_increase (self);
#line 102 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
#line 102 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self + 1;
-#line 3447 "Photo.c"
+#line 3471 "Photo.c"
} else {
#line 102 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self;
-#line 3451 "Photo.c"
+#line 3475 "Photo.c"
}
#line 102 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 102 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3457 "Photo.c"
+#line 3481 "Photo.c"
}
Rating rating_decrease (Rating self) {
Rating result = 0;
Rating _tmp0_ = 0;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 106 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = rating_can_decrease (self);
#line 106 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
#line 106 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self - 1;
-#line 3471 "Photo.c"
+#line 3495 "Photo.c"
} else {
#line 106 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self;
-#line 3475 "Photo.c"
+#line 3499 "Photo.c"
}
#line 106 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 106 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3481 "Photo.c"
+#line 3505 "Photo.c"
}
@@ -3487,73 +3511,73 @@ gint rating_serialize (Rating self) {
switch (self) {
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_REJECTED:
-#line 3491 "Photo.c"
+#line 3515 "Photo.c"
{
#line 112 "/home/jens/Source/shotwell/src/Photo.vala"
result = -1;
#line 112 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3497 "Photo.c"
+#line 3521 "Photo.c"
}
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_UNRATED:
-#line 3501 "Photo.c"
+#line 3525 "Photo.c"
{
#line 114 "/home/jens/Source/shotwell/src/Photo.vala"
result = 0;
#line 114 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3507 "Photo.c"
+#line 3531 "Photo.c"
}
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_ONE:
-#line 3511 "Photo.c"
+#line 3535 "Photo.c"
{
#line 116 "/home/jens/Source/shotwell/src/Photo.vala"
result = 1;
#line 116 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3517 "Photo.c"
+#line 3541 "Photo.c"
}
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_TWO:
-#line 3521 "Photo.c"
+#line 3545 "Photo.c"
{
#line 118 "/home/jens/Source/shotwell/src/Photo.vala"
result = 2;
#line 118 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3527 "Photo.c"
+#line 3551 "Photo.c"
}
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_THREE:
-#line 3531 "Photo.c"
+#line 3555 "Photo.c"
{
#line 120 "/home/jens/Source/shotwell/src/Photo.vala"
result = 3;
#line 120 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3537 "Photo.c"
+#line 3561 "Photo.c"
}
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_FOUR:
-#line 3541 "Photo.c"
+#line 3565 "Photo.c"
{
#line 122 "/home/jens/Source/shotwell/src/Photo.vala"
result = 4;
#line 122 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3547 "Photo.c"
+#line 3571 "Photo.c"
}
#line 110 "/home/jens/Source/shotwell/src/Photo.vala"
case RATING_FIVE:
-#line 3551 "Photo.c"
+#line 3575 "Photo.c"
{
#line 124 "/home/jens/Source/shotwell/src/Photo.vala"
result = 5;
#line 124 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3557 "Photo.c"
+#line 3581 "Photo.c"
}
default:
{
@@ -3561,7 +3585,7 @@ gint rating_serialize (Rating self) {
result = 0;
#line 126 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3565 "Photo.c"
+#line 3589 "Photo.c"
}
}
}
@@ -3569,8 +3593,8 @@ gint rating_serialize (Rating self) {
Rating rating_unserialize (gint value) {
Rating result = 0;
- gint _tmp0_ = 0;
- gint _tmp2_ = 0;
+ gint _tmp0_;
+ gint _tmp2_;
#line 131 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = value;
#line 131 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3579,9 +3603,9 @@ Rating rating_unserialize (gint value) {
result = RATING_FIVE;
#line 132 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3583 "Photo.c"
+#line 3607 "Photo.c"
} else {
- gint _tmp1_ = 0;
+ gint _tmp1_;
#line 133 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = value;
#line 133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3590,7 +3614,7 @@ Rating rating_unserialize (gint value) {
result = RATING_REJECTED;
#line 134 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3594 "Photo.c"
+#line 3618 "Photo.c"
}
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3599,73 +3623,73 @@ Rating rating_unserialize (gint value) {
switch (_tmp2_) {
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case -1:
-#line 3603 "Photo.c"
+#line 3627 "Photo.c"
{
#line 138 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_REJECTED;
#line 138 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3609 "Photo.c"
+#line 3633 "Photo.c"
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case 0:
-#line 3613 "Photo.c"
+#line 3637 "Photo.c"
{
#line 140 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_UNRATED;
#line 140 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3619 "Photo.c"
+#line 3643 "Photo.c"
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case 1:
-#line 3623 "Photo.c"
+#line 3647 "Photo.c"
{
#line 142 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_ONE;
#line 142 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3629 "Photo.c"
+#line 3653 "Photo.c"
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case 2:
-#line 3633 "Photo.c"
+#line 3657 "Photo.c"
{
#line 144 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_TWO;
#line 144 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3639 "Photo.c"
+#line 3663 "Photo.c"
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case 3:
-#line 3643 "Photo.c"
+#line 3667 "Photo.c"
{
#line 146 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_THREE;
#line 146 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3649 "Photo.c"
+#line 3673 "Photo.c"
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case 4:
-#line 3653 "Photo.c"
+#line 3677 "Photo.c"
{
#line 148 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_FOUR;
#line 148 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3659 "Photo.c"
+#line 3683 "Photo.c"
}
#line 136 "/home/jens/Source/shotwell/src/Photo.vala"
case 5:
-#line 3663 "Photo.c"
+#line 3687 "Photo.c"
{
#line 150 "/home/jens/Source/shotwell/src/Photo.vala"
result = RATING_FIVE;
#line 150 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3669 "Photo.c"
+#line 3693 "Photo.c"
}
default:
{
@@ -3673,7 +3697,7 @@ Rating rating_unserialize (gint value) {
result = RATING_UNRATED;
#line 152 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3677 "Photo.c"
+#line 3701 "Photo.c"
}
}
}
@@ -3693,27 +3717,27 @@ GType rating_get_type (void) {
gboolean photo_exception_prohibits (PhotoException self, PhotoException exception) {
gboolean result = FALSE;
- PhotoException _tmp0_ = 0;
+ PhotoException _tmp0_;
#line 228 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = exception;
#line 228 "/home/jens/Source/shotwell/src/Photo.vala"
result = (self & _tmp0_) != 0;
#line 228 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3704 "Photo.c"
+#line 3728 "Photo.c"
}
gboolean photo_exception_allows (PhotoException self, PhotoException exception) {
gboolean result = FALSE;
- PhotoException _tmp0_ = 0;
+ PhotoException _tmp0_;
#line 232 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = exception;
#line 232 "/home/jens/Source/shotwell/src/Photo.vala"
result = (self & _tmp0_) == 0;
#line 232 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 3717 "Photo.c"
+#line 3741 "Photo.c"
}
@@ -3732,59 +3756,59 @@ GType photo_exception_get_type (void) {
static gpointer _photo_row_ref0 (gpointer self) {
#line 400 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? photo_row_ref (self) : NULL;
-#line 3736 "Photo.c"
+#line 3760 "Photo.c"
}
static gpointer _backing_photo_row_ref0 (gpointer self) {
#line 421 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? backing_photo_row_ref (self) : NULL;
-#line 3743 "Photo.c"
+#line 3767 "Photo.c"
}
Photo* photo_construct (GType object_type, PhotoRow* row) {
Photo * self = NULL;
- PhotoRow* _tmp0_ = NULL;
- PhotoRow* _tmp1_ = NULL;
- PhotoRow* _tmp2_ = NULL;
- PhotoRow* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- PhotoRow* _tmp6_ = NULL;
- PhotoRow* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- PhotoBackingReaders* _tmp10_ = NULL;
- PhotoRow* _tmp11_ = NULL;
- BackingPhotoRow* _tmp12_ = NULL;
- PhotoFileFormat _tmp13_ = 0;
- PhotoRow* _tmp14_ = NULL;
- BackingPhotoRow* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- PhotoFileReader* _tmp17_ = NULL;
+ PhotoRow* _tmp0_;
+ PhotoRow* _tmp1_;
+ PhotoRow* _tmp2_;
+ PhotoRow* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ PhotoRow* _tmp6_;
+ PhotoRow* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ PhotoBackingReaders* _tmp10_;
+ PhotoRow* _tmp11_;
+ BackingPhotoRow* _tmp12_;
+ PhotoFileFormat _tmp13_;
+ PhotoRow* _tmp14_;
+ BackingPhotoRow* _tmp15_;
+ const gchar* _tmp16_;
+ PhotoFileReader* _tmp17_;
gchar* basename = NULL;
- PhotoRow* _tmp18_ = NULL;
- BackingPhotoRow* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- const gchar* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
- PhotoRow* _tmp31_ = NULL;
- BackingPhotoID _tmp32_ = {0};
- gint64 _tmp33_ = 0LL;
- PhotoRow* _tmp49_ = NULL;
- BackingPhotoRow* _tmp50_ = NULL;
- PhotoFileFormat _tmp51_ = 0;
+ PhotoRow* _tmp18_;
+ BackingPhotoRow* _tmp19_;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
+ const gchar* _tmp22_;
+ const gchar* _tmp25_;
+ gboolean _tmp26_;
+ PhotoRow* _tmp31_;
+ BackingPhotoID _tmp32_;
+ gint64 _tmp33_;
+ PhotoRow* _tmp49_;
+ BackingPhotoRow* _tmp50_;
+ PhotoFileFormat _tmp51_;
gboolean _tmp67_ = FALSE;
- PhotoRow* _tmp68_ = NULL;
- BackingPhotoRow* _tmp69_ = NULL;
- PhotoFileFormat _tmp70_ = 0;
- PhotoBackingReaders* _tmp85_ = NULL;
- PhotoFileReader* _tmp86_ = NULL;
- PhotoRow* _tmp106_ = NULL;
- time_t _tmp107_ = 0;
+ PhotoRow* _tmp68_;
+ BackingPhotoRow* _tmp69_;
+ PhotoFileFormat _tmp70_;
+ PhotoBackingReaders* _tmp85_;
+ PhotoFileReader* _tmp86_;
+ PhotoRow* _tmp106_;
+ time_t _tmp107_;
GError * _inner_error_ = NULL;
#line 399 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
@@ -3856,9 +3880,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp22_ = basename;
#line 412 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_ != NULL) {
-#line 3860 "Photo.c"
- const gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
+#line 3884 "Photo.c"
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
#line 413 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = basename;
#line 413 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3867,7 +3891,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_g_free0 (self->priv->file_title);
#line 413 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->file_title = _tmp24_;
-#line 3871 "Photo.c"
+#line 3895 "Photo.c"
}
#line 415 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = self->priv->file_title;
@@ -3875,11 +3899,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp26_ = is_string_empty (_tmp25_);
#line 415 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp26_) {
-#line 3879 "Photo.c"
- PhotoRow* _tmp27_ = NULL;
- BackingPhotoRow* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
+#line 3903 "Photo.c"
+ PhotoRow* _tmp27_;
+ BackingPhotoRow* _tmp28_;
+ const gchar* _tmp29_;
+ gchar* _tmp30_;
#line 416 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = row;
#line 416 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3892,7 +3916,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_g_free0 (self->priv->file_title);
#line 416 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->file_title = _tmp30_;
-#line 3896 "Photo.c"
+#line 3920 "Photo.c"
}
#line 418 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = row;
@@ -3902,12 +3926,12 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp33_ = _tmp32_.id;
#line 418 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp33_ != BACKING_PHOTO_ID_INVALID) {
-#line 3906 "Photo.c"
+#line 3930 "Photo.c"
BackingPhotoRow* e = NULL;
- PhotoRow* _tmp34_ = NULL;
- BackingPhotoID _tmp35_ = {0};
- BackingPhotoRow* _tmp36_ = NULL;
- BackingPhotoRow* _tmp37_ = NULL;
+ PhotoRow* _tmp34_;
+ BackingPhotoID _tmp35_;
+ BackingPhotoRow* _tmp36_;
+ BackingPhotoRow* _tmp37_;
#line 419 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = row;
#line 419 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3920,15 +3944,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp37_ = e;
#line 420 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp37_ != NULL) {
-#line 3924 "Photo.c"
- BackingPhotoRow* _tmp38_ = NULL;
- BackingPhotoRow* _tmp39_ = NULL;
- PhotoBackingReaders* _tmp40_ = NULL;
- BackingPhotoRow* _tmp41_ = NULL;
- PhotoFileFormat _tmp42_ = 0;
- BackingPhotoRow* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
- PhotoFileReader* _tmp45_ = NULL;
+#line 3948 "Photo.c"
+ BackingPhotoRow* _tmp38_;
+ BackingPhotoRow* _tmp39_;
+ PhotoBackingReaders* _tmp40_;
+ BackingPhotoRow* _tmp41_;
+ PhotoFileFormat _tmp42_;
+ BackingPhotoRow* _tmp43_;
+ const gchar* _tmp44_;
+ PhotoFileReader* _tmp45_;
#line 421 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = e;
#line 421 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3953,12 +3977,12 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_photo_file_adapter_unref0 (_tmp40_->editable);
#line 422 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_->editable = _tmp45_;
-#line 3957 "Photo.c"
+#line 3981 "Photo.c"
} else {
{
- PhotoTable* _tmp46_ = NULL;
- PhotoTable* _tmp47_ = NULL;
- PhotoRow* _tmp48_ = NULL;
+ PhotoTable* _tmp46_;
+ PhotoTable* _tmp47_;
+ PhotoRow* _tmp48_;
#line 425 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = photo_table_get_instance ();
#line 425 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3973,8 +3997,8 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 425 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3977 "Photo.c"
- goto __catch256_database_error;
+#line 4001 "Photo.c"
+ goto __catch257_database_error;
}
#line 425 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (e);
@@ -3986,11 +4010,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
g_clear_error (&_inner_error_);
#line 425 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 3990 "Photo.c"
+#line 4014 "Photo.c"
}
}
- goto __finally256;
- __catch256_database_error:
+ goto __finally257;
+ __catch257_database_error:
{
GError* err = NULL;
#line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3999,9 +4023,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_inner_error_ = NULL;
#line 424 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 4003 "Photo.c"
+#line 4027 "Photo.c"
}
- __finally256:
+ __finally257:
#line 424 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4014,15 +4038,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
g_clear_error (&_inner_error_);
#line 424 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 4018 "Photo.c"
+#line 4042 "Photo.c"
}
#line 432 "/home/jens/Source/shotwell/src/Photo.vala"
photo_internal_remove_all_transformations (self, FALSE);
-#line 4022 "Photo.c"
+#line 4046 "Photo.c"
}
#line 418 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (e);
-#line 4026 "Photo.c"
+#line 4050 "Photo.c"
}
#line 436 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = row;
@@ -4032,10 +4056,10 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp51_ = _tmp50_->file_format;
#line 436 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4036 "Photo.c"
- GeeHashMap* _tmp52_ = NULL;
- gint _tmp53_ = 0;
- RawDeveloper* _tmp54_ = NULL;
+#line 4060 "Photo.c"
+ GeeHashMap* _tmp52_;
+ gint _tmp53_;
+ RawDeveloper* _tmp54_;
#line 438 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = gee_hash_map_new (TYPE_RAW_DEVELOPER, NULL, NULL, TYPE_BACKING_PHOTO_ROW, (GBoxedCopyFunc) backing_photo_row_ref, (GDestroyNotify) backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4044,7 +4068,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
self->priv->developments = _tmp52_;
#line 439 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp54_ = raw_developer_as_array (&_tmp53_);
-#line 4048 "Photo.c"
+#line 4072 "Photo.c"
{
RawDeveloper* d_collection = NULL;
gint d_collection_length1 = 0;
@@ -4056,20 +4080,20 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
d_collection_length1 = _tmp53_;
#line 439 "/home/jens/Source/shotwell/src/Photo.vala"
for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) {
-#line 4060 "Photo.c"
+#line 4084 "Photo.c"
RawDeveloper d = 0;
#line 439 "/home/jens/Source/shotwell/src/Photo.vala"
d = d_collection[d_it];
-#line 4064 "Photo.c"
+#line 4088 "Photo.c"
{
BackingPhotoID id = {0};
- PhotoRow* _tmp55_ = NULL;
- BackingPhotoID* _tmp56_ = NULL;
- gint _tmp56__length1 = 0;
- RawDeveloper _tmp57_ = 0;
- BackingPhotoID _tmp58_ = {0};
- BackingPhotoID _tmp59_ = {0};
- gint64 _tmp60_ = 0LL;
+ PhotoRow* _tmp55_;
+ BackingPhotoID* _tmp56_;
+ gint _tmp56__length1;
+ RawDeveloper _tmp57_;
+ BackingPhotoID _tmp58_;
+ BackingPhotoID _tmp59_;
+ gint64 _tmp60_;
#line 440 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = row;
#line 440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4088,11 +4112,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp60_ = _tmp59_.id;
#line 441 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp60_ != BACKING_PHOTO_ID_INVALID) {
-#line 4092 "Photo.c"
+#line 4116 "Photo.c"
BackingPhotoRow* bpr = NULL;
- BackingPhotoID _tmp61_ = {0};
- BackingPhotoRow* _tmp62_ = NULL;
- BackingPhotoRow* _tmp63_ = NULL;
+ BackingPhotoID _tmp61_;
+ BackingPhotoRow* _tmp62_;
+ BackingPhotoRow* _tmp63_;
#line 442 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = id;
#line 442 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4103,10 +4127,10 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp63_ = bpr;
#line 443 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp63_ != NULL) {
-#line 4107 "Photo.c"
- GeeHashMap* _tmp64_ = NULL;
- RawDeveloper _tmp65_ = 0;
- BackingPhotoRow* _tmp66_ = NULL;
+#line 4131 "Photo.c"
+ GeeHashMap* _tmp64_;
+ RawDeveloper _tmp65_;
+ BackingPhotoRow* _tmp66_;
#line 444 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp64_ = self->priv->developments;
#line 444 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4115,17 +4139,17 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp66_ = bpr;
#line 444 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp65_), _tmp66_);
-#line 4119 "Photo.c"
+#line 4143 "Photo.c"
}
#line 441 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bpr);
-#line 4123 "Photo.c"
+#line 4147 "Photo.c"
}
}
}
#line 439 "/home/jens/Source/shotwell/src/Photo.vala"
d_collection = (g_free (d_collection), NULL);
-#line 4129 "Photo.c"
+#line 4153 "Photo.c"
}
}
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4136,11 +4160,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp70_ = _tmp69_->file_format;
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4140 "Photo.c"
- GeeHashMap* _tmp71_ = NULL;
- PhotoRow* _tmp72_ = NULL;
- RawDeveloper _tmp73_ = 0;
- gboolean _tmp74_ = FALSE;
+#line 4164 "Photo.c"
+ GeeHashMap* _tmp71_;
+ PhotoRow* _tmp72_;
+ RawDeveloper _tmp73_;
+ gboolean _tmp74_;
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp71_ = self->priv->developments;
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4151,26 +4175,26 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp74_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp73_));
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp67_ = _tmp74_;
-#line 4155 "Photo.c"
+#line 4179 "Photo.c"
} else {
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp67_ = FALSE;
-#line 4159 "Photo.c"
+#line 4183 "Photo.c"
}
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp67_) {
-#line 4163 "Photo.c"
+#line 4187 "Photo.c"
BackingPhotoRow* r = NULL;
- GeeHashMap* _tmp75_ = NULL;
- PhotoRow* _tmp76_ = NULL;
- RawDeveloper _tmp77_ = 0;
- gpointer _tmp78_ = NULL;
- PhotoBackingReaders* _tmp79_ = NULL;
- BackingPhotoRow* _tmp80_ = NULL;
- PhotoFileFormat _tmp81_ = 0;
- BackingPhotoRow* _tmp82_ = NULL;
- const gchar* _tmp83_ = NULL;
- PhotoFileReader* _tmp84_ = NULL;
+ GeeHashMap* _tmp75_;
+ PhotoRow* _tmp76_;
+ RawDeveloper _tmp77_;
+ gpointer _tmp78_;
+ PhotoBackingReaders* _tmp79_;
+ BackingPhotoRow* _tmp80_;
+ PhotoFileFormat _tmp81_;
+ BackingPhotoRow* _tmp82_;
+ const gchar* _tmp83_;
+ PhotoFileReader* _tmp84_;
#line 451 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp75_ = self->priv->developments;
#line 451 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4199,7 +4223,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp79_->developer = _tmp84_;
#line 450 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (r);
-#line 4203 "Photo.c"
+#line 4227 "Photo.c"
}
#line 456 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp85_ = self->priv->readers;
@@ -4207,9 +4231,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp86_ = _tmp85_->editable;
#line 456 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp86_ != NULL) {
-#line 4211 "Photo.c"
- BackingPhotoRow* _tmp87_ = NULL;
- BackingPhotoRow* _tmp88_ = NULL;
+#line 4235 "Photo.c"
+ BackingPhotoRow* _tmp87_;
+ BackingPhotoRow* _tmp88_;
#line 457 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp87_ = self->priv->editable;
#line 457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4218,11 +4242,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_backing_photo_row_unref0 (self->backing_photo_row);
#line 457 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_photo_row = _tmp88_;
-#line 4222 "Photo.c"
+#line 4246 "Photo.c"
} else {
- PhotoRow* _tmp89_ = NULL;
- BackingPhotoRow* _tmp90_ = NULL;
- PhotoFileFormat _tmp91_ = 0;
+ PhotoRow* _tmp89_;
+ BackingPhotoRow* _tmp90_;
+ PhotoFileFormat _tmp91_;
#line 458 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp89_ = row;
#line 458 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4231,10 +4255,10 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp91_ = _tmp90_->file_format;
#line 458 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) {
-#line 4235 "Photo.c"
- PhotoRow* _tmp92_ = NULL;
- BackingPhotoRow* _tmp93_ = NULL;
- BackingPhotoRow* _tmp94_ = NULL;
+#line 4259 "Photo.c"
+ PhotoRow* _tmp92_;
+ BackingPhotoRow* _tmp93_;
+ BackingPhotoRow* _tmp94_;
#line 459 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp92_ = self->row;
#line 459 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4245,12 +4269,12 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_backing_photo_row_unref0 (self->backing_photo_row);
#line 459 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_photo_row = _tmp94_;
-#line 4249 "Photo.c"
+#line 4273 "Photo.c"
} else {
- GeeHashMap* _tmp95_ = NULL;
- PhotoRow* _tmp96_ = NULL;
- RawDeveloper _tmp97_ = 0;
- gboolean _tmp98_ = FALSE;
+ GeeHashMap* _tmp95_;
+ PhotoRow* _tmp96_;
+ RawDeveloper _tmp97_;
+ gboolean _tmp98_;
#line 463 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp95_ = self->priv->developments;
#line 463 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4261,11 +4285,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_tmp98_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp97_));
#line 463 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp98_) {
-#line 4265 "Photo.c"
- GeeHashMap* _tmp99_ = NULL;
- PhotoRow* _tmp100_ = NULL;
- RawDeveloper _tmp101_ = 0;
- gpointer _tmp102_ = NULL;
+#line 4289 "Photo.c"
+ GeeHashMap* _tmp99_;
+ PhotoRow* _tmp100_;
+ RawDeveloper _tmp101_;
+ gpointer _tmp102_;
#line 464 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp99_ = self->priv->developments;
#line 464 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4278,11 +4302,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_backing_photo_row_unref0 (self->backing_photo_row);
#line 464 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_photo_row = (BackingPhotoRow*) _tmp102_;
-#line 4282 "Photo.c"
+#line 4306 "Photo.c"
} else {
- PhotoRow* _tmp103_ = NULL;
- BackingPhotoRow* _tmp104_ = NULL;
- BackingPhotoRow* _tmp105_ = NULL;
+ PhotoRow* _tmp103_;
+ BackingPhotoRow* _tmp104_;
+ BackingPhotoRow* _tmp105_;
#line 467 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp103_ = self->row;
#line 467 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4293,7 +4317,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_backing_photo_row_unref0 (self->backing_photo_row);
#line 467 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_photo_row = _tmp105_;
-#line 4297 "Photo.c"
+#line 4321 "Photo.c"
}
}
}
@@ -4307,24 +4331,24 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
_g_free0 (basename);
#line 399 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 4311 "Photo.c"
+#line 4335 "Photo.c"
}
void photo_init_photo (void) {
- GeeLinkedList* _tmp0_ = NULL;
+ GeeLinkedList* _tmp0_;
#line 475 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, (GDestroyNotify) photo_cached_pixbuf_unref, NULL, NULL, NULL);
#line 475 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo_source_pixbuf_cache);
#line 475 "/home/jens/Source/shotwell/src/Photo.vala"
photo_source_pixbuf_cache = _tmp0_;
-#line 4323 "Photo.c"
+#line 4347 "Photo.c"
}
void photo_terminate_photo (void) {
- guint _tmp0_ = 0U;
+ guint _tmp0_;
#line 479 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo_source_pixbuf_cache);
#line 479 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4333,22 +4357,22 @@ void photo_terminate_photo (void) {
_tmp0_ = photo_discard_source_id;
#line 481 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ != ((guint) 0)) {
-#line 4337 "Photo.c"
- guint _tmp1_ = 0U;
+#line 4361 "Photo.c"
+ guint _tmp1_;
#line 482 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_discard_source_id;
#line 482 "/home/jens/Source/shotwell/src/Photo.vala"
g_source_remove (_tmp1_);
#line 483 "/home/jens/Source/shotwell/src/Photo.vala"
photo_discard_source_id = (guint) 0;
-#line 4345 "Photo.c"
+#line 4369 "Photo.c"
}
}
static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_file) {
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
#line 487 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
#line 487 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4358,8 +4382,8 @@ static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, G
#line 488 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = new_file;
#line 488 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "editable-replaced", _tmp0_, _tmp1_);
-#line 4363 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 4387 "Photo.c"
}
@@ -4368,14 +4392,14 @@ void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_fi
g_return_if_fail (IS_PHOTO (self));
#line 487 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_editable_replaced (self, old_file, new_file);
-#line 4372 "Photo.c"
+#line 4396 "Photo.c"
}
static void photo_real_notify_raw_development_modified (Photo* self) {
#line 492 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "raw-development-modified");
-#line 4379 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL], 0);
+#line 4403 "Photo.c"
}
@@ -4384,14 +4408,14 @@ void photo_notify_raw_development_modified (Photo* self) {
g_return_if_fail (IS_PHOTO (self));
#line 491 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_raw_development_modified (self);
-#line 4388 "Photo.c"
+#line 4412 "Photo.c"
}
static void photo_real_notify_baseline_replaced (Photo* self) {
#line 496 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "baseline-replaced");
-#line 4395 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL], 0);
+#line 4419 "Photo.c"
}
@@ -4400,19 +4424,19 @@ void photo_notify_baseline_replaced (Photo* self) {
g_return_if_fail (IS_PHOTO (self));
#line 495 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_baseline_replaced (self);
-#line 4404 "Photo.c"
+#line 4428 "Photo.c"
}
static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* metadata) {
- PhotoMetadata* _tmp0_ = NULL;
+ PhotoMetadata* _tmp0_;
#line 499 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
#line 500 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = metadata;
#line 500 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "master-reimported", _tmp0_);
-#line 4416 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4440 "Photo.c"
}
@@ -4421,19 +4445,19 @@ void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) {
g_return_if_fail (IS_PHOTO (self));
#line 499 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_master_reimported (self, metadata);
-#line 4425 "Photo.c"
+#line 4449 "Photo.c"
}
static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) {
- PhotoMetadata* _tmp0_ = NULL;
+ PhotoMetadata* _tmp0_;
#line 503 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
#line 504 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = metadata;
#line 504 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "editable-reimported", _tmp0_);
-#line 4437 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4461 "Photo.c"
}
@@ -4442,19 +4466,19 @@ void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) {
g_return_if_fail (IS_PHOTO (self));
#line 503 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_editable_reimported (self, metadata);
-#line 4446 "Photo.c"
+#line 4470 "Photo.c"
}
static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* metadata) {
- PhotoMetadata* _tmp0_ = NULL;
+ PhotoMetadata* _tmp0_;
#line 507 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
#line 508 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = metadata;
#line 508 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "source-reimported", _tmp0_);
-#line 4458 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4482 "Photo.c"
}
@@ -4463,19 +4487,19 @@ void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) {
g_return_if_fail (IS_PHOTO (self));
#line 507 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_source_reimported (self, metadata);
-#line 4467 "Photo.c"
+#line 4491 "Photo.c"
}
static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
- PhotoMetadata* _tmp0_ = NULL;
+ PhotoMetadata* _tmp0_;
#line 511 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
#line 512 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = metadata;
#line 512 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "baseline-reimported", _tmp0_);
-#line 4479 "Photo.c"
+ g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_);
+#line 4503 "Photo.c"
}
@@ -4484,7 +4508,7 @@ void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
g_return_if_fail (IS_PHOTO (self));
#line 511 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->notify_baseline_reimported (self, metadata);
-#line 4488 "Photo.c"
+#line 4512 "Photo.c"
}
@@ -4493,11 +4517,11 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
gboolean result = FALSE;
gboolean ret = FALSE;
GFile* file = NULL;
- PhotoFileFormat _tmp8_ = 0;
- GFile* _tmp12_ = NULL;
+ PhotoFileFormat _tmp8_;
+ GFile* _tmp12_;
gboolean _tmp24_ = FALSE;
gboolean _tmp25_ = FALSE;
- gboolean _tmp26_ = FALSE;
+ gboolean _tmp26_;
GError * _inner_error_ = NULL;
#line 515 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -4505,27 +4529,27 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
ret = TRUE;
#line 517 "/home/jens/Source/shotwell/src/Photo.vala"
file = NULL;
-#line 4509 "Photo.c"
+#line 4533 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 4516 "Photo.c"
+#line 4540 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
#line 519 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 519 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 519 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 4526 "Photo.c"
- PhotoBackingReaders* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
+#line 4550 "Photo.c"
+ PhotoBackingReaders* _tmp3_;
+ PhotoFileReader* _tmp4_;
+ GFile* _tmp5_;
#line 520 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 520 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4536,21 +4560,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_g_object_unref0 (file);
#line 520 "/home/jens/Source/shotwell/src/Photo.vala"
file = _tmp5_;
-#line 4540 "Photo.c"
+#line 4564 "Photo.c"
}
}
- __finally257:
+ __finally258:
{
- PhotoBackingReaders* _tmp6_ = NULL;
+ PhotoBackingReaders* _tmp6_;
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->readers;
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 4550 "Photo.c"
+#line 4574 "Photo.c"
}
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4554 "Photo.c"
+#line 4578 "Photo.c"
gboolean _tmp7_ = FALSE;
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -4558,7 +4582,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_g_object_unref0 (file);
#line 518 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp7_;
-#line 4562 "Photo.c"
+#line 4586 "Photo.c"
}
}
#line 523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4567,12 +4591,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_tmp8_ = photo_get_master_file_format (self);
#line 525 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4571 "Photo.c"
- gint _tmp9_ = 0;
- RawDeveloper* _tmp10_ = NULL;
+#line 4595 "Photo.c"
+ gint _tmp9_;
+ RawDeveloper* _tmp10_;
#line 526 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = raw_developer_as_array (&_tmp9_);
-#line 4576 "Photo.c"
+#line 4600 "Photo.c"
{
RawDeveloper* d_collection = NULL;
gint d_collection_length1 = 0;
@@ -4584,34 +4608,34 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
d_collection_length1 = _tmp9_;
#line 526 "/home/jens/Source/shotwell/src/Photo.vala"
for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) {
-#line 4588 "Photo.c"
+#line 4612 "Photo.c"
RawDeveloper d = 0;
#line 526 "/home/jens/Source/shotwell/src/Photo.vala"
d = d_collection[d_it];
-#line 4592 "Photo.c"
+#line 4616 "Photo.c"
{
- RawDeveloper _tmp11_ = 0;
+ RawDeveloper _tmp11_;
#line 527 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = d;
#line 527 "/home/jens/Source/shotwell/src/Photo.vala"
photo_delete_raw_development (self, _tmp11_);
-#line 4599 "Photo.c"
+#line 4623 "Photo.c"
}
}
#line 526 "/home/jens/Source/shotwell/src/Photo.vala"
d_collection = (g_free (d_collection), NULL);
-#line 4604 "Photo.c"
+#line 4628 "Photo.c"
}
}
#line 531 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = file;
#line 531 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_ != NULL) {
-#line 4611 "Photo.c"
+#line 4635 "Photo.c"
{
gboolean _tmp13_ = FALSE;
- GFile* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ GFile* _tmp14_;
+ gboolean _tmp15_;
#line 533 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = file;
#line 533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4620,24 +4644,24 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_tmp13_ = _tmp15_;
#line 533 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4624 "Photo.c"
- goto __catch258_g_error;
+#line 4648 "Photo.c"
+ goto __catch259_g_error;
}
#line 533 "/home/jens/Source/shotwell/src/Photo.vala"
ret = _tmp13_;
-#line 4629 "Photo.c"
+#line 4653 "Photo.c"
}
- goto __finally258;
- __catch258_g_error:
+ goto __finally259;
+ __catch259_g_error:
{
GError* err = NULL;
- GFile* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- GError* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
+ GFile* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ GError* _tmp21_;
+ const gchar* _tmp22_;
#line 532 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 532 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4666,12 +4690,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_g_free0 (_tmp18_);
#line 532 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 4670 "Photo.c"
+#line 4694 "Photo.c"
}
- __finally258:
+ __finally259:
#line 532 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4675 "Photo.c"
+#line 4699 "Photo.c"
gboolean _tmp23_ = FALSE;
#line 532 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -4679,7 +4703,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_g_object_unref0 (file);
#line 532 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp23_;
-#line 4683 "Photo.c"
+#line 4707 "Photo.c"
}
}
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4688,7 +4712,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_tmp25_ = _tmp26_;
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4692 "Photo.c"
+#line 4716 "Photo.c"
gboolean _tmp27_ = FALSE;
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -4696,21 +4720,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_g_object_unref0 (file);
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp27_;
-#line 4700 "Photo.c"
+#line 4724 "Photo.c"
}
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp25_) {
-#line 4704 "Photo.c"
- gboolean _tmp28_ = FALSE;
+#line 4728 "Photo.c"
+ gboolean _tmp28_;
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = ret;
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = _tmp28_;
-#line 4710 "Photo.c"
+#line 4734 "Photo.c"
} else {
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = FALSE;
-#line 4714 "Photo.c"
+#line 4738 "Photo.c"
}
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp24_;
@@ -4718,16 +4742,16 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
_g_object_unref0 (file);
#line 542 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 4722 "Photo.c"
+#line 4746 "Photo.c"
}
static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id) {
BackingPhotoRow* result = NULL;
- BackingPhotoID _tmp0_ = {0};
- gint64 _tmp1_ = 0LL;
+ BackingPhotoID _tmp0_;
+ gint64 _tmp1_;
BackingPhotoRow* backing_row = NULL;
- BackingPhotoRow* _tmp13_ = NULL;
+ BackingPhotoRow* _tmp13_;
GError * _inner_error_ = NULL;
#line 547 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -4743,19 +4767,19 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
result = NULL;
#line 549 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 4747 "Photo.c"
+#line 4771 "Photo.c"
}
#line 551 "/home/jens/Source/shotwell/src/Photo.vala"
backing_row = NULL;
-#line 4751 "Photo.c"
+#line 4775 "Photo.c"
{
BackingPhotoRow* _tmp2_ = NULL;
- BackingPhotoTable* _tmp3_ = NULL;
- BackingPhotoTable* _tmp4_ = NULL;
- BackingPhotoID _tmp5_ = {0};
- BackingPhotoRow* _tmp6_ = NULL;
- BackingPhotoRow* _tmp7_ = NULL;
- BackingPhotoRow* _tmp8_ = NULL;
+ BackingPhotoTable* _tmp3_;
+ BackingPhotoTable* _tmp4_;
+ BackingPhotoID _tmp5_;
+ BackingPhotoRow* _tmp6_;
+ BackingPhotoRow* _tmp7_;
+ BackingPhotoRow* _tmp8_;
#line 553 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = backing_photo_table_get_instance ();
#line 553 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4774,8 +4798,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 553 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4778 "Photo.c"
- goto __catch259_database_error;
+#line 4802 "Photo.c"
+ goto __catch260_database_error;
}
#line 553 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (backing_row);
@@ -4785,7 +4809,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
g_clear_error (&_inner_error_);
#line 553 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 4789 "Photo.c"
+#line 4813 "Photo.c"
}
#line 553 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _tmp2_;
@@ -4797,16 +4821,16 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
backing_row = _tmp8_;
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp2_);
-#line 4801 "Photo.c"
+#line 4825 "Photo.c"
}
- goto __finally259;
- __catch259_database_error:
+ goto __finally260;
+ __catch260_database_error:
{
GError* err = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ GError* _tmp11_;
+ const gchar* _tmp12_;
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4825,9 +4849,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
_g_free0 (_tmp10_);
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 4829 "Photo.c"
+#line 4853 "Photo.c"
}
- __finally259:
+ __finally260:
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4838,17 +4862,17 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
g_clear_error (&_inner_error_);
#line 552 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 4842 "Photo.c"
+#line 4866 "Photo.c"
}
#line 558 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = backing_row;
#line 558 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_ == NULL) {
-#line 4848 "Photo.c"
+#line 4872 "Photo.c"
{
- BackingPhotoTable* _tmp14_ = NULL;
- BackingPhotoTable* _tmp15_ = NULL;
- BackingPhotoID _tmp16_ = {0};
+ BackingPhotoTable* _tmp14_;
+ BackingPhotoTable* _tmp15_;
+ BackingPhotoID _tmp16_;
#line 560 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = backing_photo_table_get_instance ();
#line 560 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4863,8 +4887,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 560 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4867 "Photo.c"
- goto __catch260_database_error;
+#line 4891 "Photo.c"
+ goto __catch261_database_error;
}
#line 560 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (backing_row);
@@ -4874,11 +4898,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
g_clear_error (&_inner_error_);
#line 560 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 4878 "Photo.c"
+#line 4902 "Photo.c"
}
}
- goto __finally260;
- __catch260_database_error:
+ goto __finally261;
+ __catch261_database_error:
{
GError* err = NULL;
#line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4887,9 +4911,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
_inner_error_ = NULL;
#line 559 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 4891 "Photo.c"
+#line 4915 "Photo.c"
}
- __finally260:
+ __finally261:
#line 559 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4900,7 +4924,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
g_clear_error (&_inner_error_);
#line 559 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 4904 "Photo.c"
+#line 4928 "Photo.c"
}
#line 564 "/home/jens/Source/shotwell/src/Photo.vala"
result = NULL;
@@ -4908,13 +4932,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
_backing_photo_row_unref0 (backing_row);
#line 564 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 4912 "Photo.c"
+#line 4936 "Photo.c"
}
#line 567 "/home/jens/Source/shotwell/src/Photo.vala"
result = backing_row;
#line 567 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 4918 "Photo.c"
+#line 4942 "Photo.c"
}
@@ -4923,20 +4947,20 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
GError * _inner_error_ = NULL;
#line 572 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4927 "Photo.c"
+#line 4951 "Photo.c"
{
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
gboolean _tmp13_ = FALSE;
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->developments;
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 4935 "Photo.c"
+#line 4959 "Photo.c"
{
gboolean _tmp1_ = FALSE;
- GeeHashMap* _tmp2_ = NULL;
- RawDeveloper _tmp3_ = 0;
- gboolean _tmp4_ = FALSE;
+ GeeHashMap* _tmp2_;
+ RawDeveloper _tmp3_;
+ gboolean _tmp4_;
#line 574 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->developments;
#line 574 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4945,13 +4969,13 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_));
#line 574 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp4_) {
-#line 4949 "Photo.c"
- GeeHashMap* _tmp5_ = NULL;
- RawDeveloper _tmp6_ = 0;
- gpointer _tmp7_ = NULL;
- BackingPhotoRow* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+#line 4973 "Photo.c"
+ GeeHashMap* _tmp5_;
+ RawDeveloper _tmp6_;
+ gpointer _tmp7_;
+ BackingPhotoRow* _tmp8_;
+ const gchar* _tmp9_;
+ gboolean _tmp10_;
#line 575 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->developments;
#line 575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4968,35 +4992,35 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
_tmp1_ = _tmp10_;
#line 575 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp8_);
-#line 4972 "Photo.c"
+#line 4996 "Photo.c"
} else {
#line 574 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 4976 "Photo.c"
+#line 5000 "Photo.c"
}
#line 574 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
-#line 4980 "Photo.c"
+#line 5004 "Photo.c"
{
- GeeHashMap* _tmp11_ = NULL;
+ GeeHashMap* _tmp11_;
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->priv->developments;
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 4987 "Photo.c"
+#line 5011 "Photo.c"
}
#line 574 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 4991 "Photo.c"
+#line 5015 "Photo.c"
}
- __finally261:
+ __finally262:
{
- GeeHashMap* _tmp12_ = NULL;
+ GeeHashMap* _tmp12_;
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->priv->developments;
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5000 "Photo.c"
+#line 5024 "Photo.c"
}
#line 573 "/home/jens/Source/shotwell/src/Photo.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);
@@ -5004,29 +5028,29 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 573 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp13_;
-#line 5008 "Photo.c"
+#line 5032 "Photo.c"
}
}
gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
gboolean result = FALSE;
- RawDeveloper _tmp7_ = 0;
+ RawDeveloper _tmp7_;
GError * _inner_error_ = NULL;
#line 580 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 5019 "Photo.c"
+#line 5043 "Photo.c"
{
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->developments;
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5026 "Photo.c"
+#line 5050 "Photo.c"
{
- GeeHashMap* _tmp1_ = NULL;
- RawDeveloper _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ GeeHashMap* _tmp1_;
+ RawDeveloper _tmp2_;
+ gboolean _tmp3_;
#line 582 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->developments;
#line 582 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5037,32 +5061,32 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
if (_tmp3_) {
#line 583 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
-#line 5041 "Photo.c"
+#line 5065 "Photo.c"
{
- GeeHashMap* _tmp4_ = NULL;
+ GeeHashMap* _tmp4_;
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->developments;
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5048 "Photo.c"
+#line 5072 "Photo.c"
}
#line 583 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5052 "Photo.c"
+#line 5076 "Photo.c"
}
}
- __finally262:
+ __finally263:
{
- GeeHashMap* _tmp5_ = NULL;
+ GeeHashMap* _tmp5_;
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->developments;
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5062 "Photo.c"
+#line 5086 "Photo.c"
}
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5066 "Photo.c"
+#line 5090 "Photo.c"
gboolean _tmp6_ = FALSE;
#line 581 "/home/jens/Source/shotwell/src/Photo.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);
@@ -5070,7 +5094,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 581 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp6_;
-#line 5074 "Photo.c"
+#line 5098 "Photo.c"
}
}
#line 586 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5079,43 +5103,43 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
switch (_tmp7_) {
#line 586 "/home/jens/Source/shotwell/src/Photo.vala"
case RAW_DEVELOPER_SHOTWELL:
-#line 5083 "Photo.c"
+#line 5107 "Photo.c"
{
#line 588 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
#line 588 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5089 "Photo.c"
+#line 5113 "Photo.c"
}
#line 586 "/home/jens/Source/shotwell/src/Photo.vala"
case RAW_DEVELOPER_CAMERA:
-#line 5093 "Photo.c"
+#line 5117 "Photo.c"
{
#line 591 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
#line 591 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5099 "Photo.c"
+#line 5123 "Photo.c"
}
#line 586 "/home/jens/Source/shotwell/src/Photo.vala"
case RAW_DEVELOPER_EMBEDDED:
-#line 5103 "Photo.c"
+#line 5127 "Photo.c"
{
{
PhotoMetadata* meta = NULL;
- PhotoMetadata* _tmp8_ = NULL;
+ PhotoMetadata* _tmp8_;
guint num_previews = 0U;
- PhotoMetadata* _tmp9_ = NULL;
- guint _tmp10_ = 0U;
- guint _tmp11_ = 0U;
+ PhotoMetadata* _tmp9_;
+ guint _tmp10_;
+ guint _tmp11_;
#line 595 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_get_master_metadata (self, &_inner_error_);
#line 595 "/home/jens/Source/shotwell/src/Photo.vala"
meta = _tmp8_;
#line 595 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5118 "Photo.c"
- goto __catch263_g_error;
+#line 5142 "Photo.c"
+ goto __catch264_g_error;
}
#line 596 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = meta;
@@ -5127,22 +5151,22 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
_tmp11_ = num_previews;
#line 598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_ > ((guint) 0)) {
-#line 5131 "Photo.c"
+#line 5155 "Photo.c"
PhotoPreview* prev = NULL;
- PhotoMetadata* _tmp12_ = NULL;
- guint _tmp13_ = 0U;
- PhotoPreview* _tmp14_ = NULL;
- PhotoPreview* _tmp15_ = NULL;
+ PhotoMetadata* _tmp12_;
+ guint _tmp13_;
+ PhotoPreview* _tmp14_;
+ PhotoPreview* _tmp15_;
Dimensions dims = {0};
- PhotoPreview* _tmp16_ = NULL;
+ PhotoPreview* _tmp16_;
Dimensions _tmp17_ = {0};
gint _tmp18_ = 0;
- Dimensions _tmp19_ = {0};
- gint _tmp20_ = 0;
- Dimensions _tmp21_ = {0};
- gint _tmp22_ = 0;
+ Dimensions _tmp19_;
+ gint _tmp20_;
+ Dimensions _tmp21_;
+ gint _tmp22_;
gint preview_major_axis = 0;
- gint _tmp27_ = 0;
+ gint _tmp27_;
#line 599 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = meta;
#line 599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5163,7 +5187,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
_media_metadata_unref0 (meta);
#line 603 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5167 "Photo.c"
+#line 5191 "Photo.c"
}
#line 605 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = prev;
@@ -5181,26 +5205,26 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
_tmp22_ = _tmp21_.height;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp20_ > _tmp22_) {
-#line 5185 "Photo.c"
- Dimensions _tmp23_ = {0};
- gint _tmp24_ = 0;
+#line 5209 "Photo.c"
+ Dimensions _tmp23_;
+ gint _tmp24_;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = dims;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = _tmp23_.width;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = _tmp24_;
-#line 5194 "Photo.c"
+#line 5218 "Photo.c"
} else {
- Dimensions _tmp25_ = {0};
- gint _tmp26_ = 0;
+ Dimensions _tmp25_;
+ gint _tmp26_;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = dims;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = _tmp25_.height;
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = _tmp26_;
-#line 5204 "Photo.c"
+#line 5228 "Photo.c"
}
#line 608 "/home/jens/Source/shotwell/src/Photo.vala"
preview_major_axis = _tmp18_;
@@ -5216,7 +5240,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
_media_metadata_unref0 (meta);
#line 610 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5220 "Photo.c"
+#line 5244 "Photo.c"
}
#line 613 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
@@ -5226,7 +5250,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
_media_metadata_unref0 (meta);
#line 613 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5230 "Photo.c"
+#line 5254 "Photo.c"
}
#line 617 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
@@ -5234,14 +5258,14 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
_media_metadata_unref0 (meta);
#line 617 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5238 "Photo.c"
+#line 5262 "Photo.c"
}
- goto __finally263;
- __catch263_g_error:
+ goto __finally264;
+ __catch264_g_error:
{
GError* e = NULL;
- GError* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
+ GError* _tmp28_;
+ const gchar* _tmp29_;
#line 594 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 594 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5254,12 +5278,12 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_);
#line 594 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 5258 "Photo.c"
+#line 5282 "Photo.c"
}
- __finally263:
+ __finally264:
#line 594 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5263 "Photo.c"
+#line 5287 "Photo.c"
gboolean _tmp30_ = FALSE;
#line 594 "/home/jens/Source/shotwell/src/Photo.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);
@@ -5267,30 +5291,30 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 594 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp30_;
-#line 5271 "Photo.c"
+#line 5295 "Photo.c"
}
#line 621 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
#line 621 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 5277 "Photo.c"
+#line 5301 "Photo.c"
}
default:
{
#line 624 "/home/jens/Source/shotwell/src/Photo.vala"
g_assert_not_reached ();
-#line 5283 "Photo.c"
+#line 5307 "Photo.c"
}
}
}
void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error) {
- PhotoRow* _tmp0_ = NULL;
- RawDeveloper _tmp1_ = 0;
- BackingPhotoRow* _tmp2_ = NULL;
- Alteration* _tmp8_ = NULL;
- Alteration* _tmp9_ = NULL;
+ PhotoRow* _tmp0_;
+ RawDeveloper _tmp1_;
+ BackingPhotoRow* _tmp2_;
+ Alteration* _tmp8_;
+ Alteration* _tmp9_;
GError * _inner_error_ = NULL;
#line 631 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -5310,19 +5334,19 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
g_propagate_error (error, _inner_error_);
#line 632 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5314 "Photo.c"
+#line 5338 "Photo.c"
}
{
- GeeHashMap* _tmp3_ = NULL;
+ GeeHashMap* _tmp3_;
#line 633 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->developments;
#line 633 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5322 "Photo.c"
+#line 5346 "Photo.c"
{
- GeeHashMap* _tmp4_ = NULL;
- RawDeveloper _tmp5_ = 0;
- BackingPhotoRow* _tmp6_ = NULL;
+ GeeHashMap* _tmp4_;
+ RawDeveloper _tmp5_;
+ BackingPhotoRow* _tmp6_;
#line 634 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->developments;
#line 634 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5331,16 +5355,16 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
_tmp6_ = bpr;
#line 634 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_);
-#line 5335 "Photo.c"
+#line 5359 "Photo.c"
}
- __finally264:
+ __finally265:
{
- GeeHashMap* _tmp7_ = NULL;
+ GeeHashMap* _tmp7_;
#line 633 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->developments;
#line 633 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5344 "Photo.c"
+#line 5368 "Photo.c"
}
#line 633 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5348,7 +5372,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
g_propagate_error (error, _inner_error_);
#line 633 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5352 "Photo.c"
+#line 5376 "Photo.c"
}
}
#line 636 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5359,52 +5383,52 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp9_);
#line 636 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp9_);
-#line 5363 "Photo.c"
+#line 5387 "Photo.c"
}
void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error) {
GFile* file = NULL;
- BackingPhotoRow* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
+ BackingPhotoRow* _tmp0_;
+ const gchar* _tmp1_;
+ GFile* _tmp2_;
GFileInfo* info = NULL;
- GFile* _tmp3_ = NULL;
- GFileInfo* _tmp4_ = NULL;
+ GFile* _tmp3_;
+ GFileInfo* _tmp4_;
GTimeVal timestamp = {0};
- GFileInfo* _tmp5_ = NULL;
+ GFileInfo* _tmp5_;
GTimeVal _tmp6_ = {0};
PhotoFileInterrogator* interrogator = NULL;
- GFile* _tmp7_ = NULL;
- PhotoFileInterrogator* _tmp8_ = NULL;
- PhotoFileInterrogator* _tmp9_ = NULL;
+ GFile* _tmp7_;
+ PhotoFileInterrogator* _tmp8_;
+ PhotoFileInterrogator* _tmp9_;
DetectedPhotoInformation* detected = NULL;
- PhotoFileInterrogator* _tmp10_ = NULL;
- DetectedPhotoInformation* _tmp11_ = NULL;
+ PhotoFileInterrogator* _tmp10_;
+ DetectedPhotoInformation* _tmp11_;
gboolean _tmp12_ = FALSE;
- DetectedPhotoInformation* _tmp13_ = NULL;
- BackingPhotoRow* _tmp16_ = NULL;
- DetectedPhotoInformation* _tmp17_ = NULL;
- Dimensions _tmp18_ = {0};
- BackingPhotoRow* _tmp19_ = NULL;
- GFileInfo* _tmp20_ = NULL;
- gint64 _tmp21_ = 0LL;
- BackingPhotoRow* _tmp22_ = NULL;
- GTimeVal _tmp23_ = {0};
- glong _tmp24_ = 0L;
+ DetectedPhotoInformation* _tmp13_;
+ BackingPhotoRow* _tmp16_;
+ DetectedPhotoInformation* _tmp17_;
+ Dimensions _tmp18_;
+ BackingPhotoRow* _tmp19_;
+ GFileInfo* _tmp20_;
+ gint64 _tmp21_;
+ BackingPhotoRow* _tmp22_;
+ GTimeVal _tmp23_;
+ glong _tmp24_;
Orientation _tmp25_ = 0;
- DetectedPhotoInformation* _tmp26_ = NULL;
- PhotoMetadata* _tmp27_ = NULL;
- BackingPhotoRow* _tmp31_ = NULL;
- BackingPhotoTable* _tmp32_ = NULL;
- BackingPhotoTable* _tmp33_ = NULL;
- BackingPhotoRow* _tmp34_ = NULL;
- PhotoTable* _tmp35_ = NULL;
- PhotoTable* _tmp36_ = NULL;
- PhotoRow* _tmp37_ = NULL;
- RawDeveloper _tmp38_ = 0;
- BackingPhotoRow* _tmp39_ = NULL;
- BackingPhotoID _tmp40_ = {0};
+ DetectedPhotoInformation* _tmp26_;
+ PhotoMetadata* _tmp27_;
+ BackingPhotoRow* _tmp31_;
+ BackingPhotoTable* _tmp32_;
+ BackingPhotoTable* _tmp33_;
+ BackingPhotoRow* _tmp34_;
+ PhotoTable* _tmp35_;
+ PhotoTable* _tmp36_;
+ PhotoRow* _tmp37_;
+ RawDeveloper _tmp38_;
+ BackingPhotoRow* _tmp39_;
+ BackingPhotoID _tmp40_;
GError * _inner_error_ = NULL;
#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO_ROW (row));
@@ -5432,7 +5456,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_g_object_unref0 (file);
#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5436 "Photo.c"
+#line 5460 "Photo.c"
}
#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = info;
@@ -5462,7 +5486,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_g_object_unref0 (file);
#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5466 "Photo.c"
+#line 5490 "Photo.c"
}
#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = interrogator;
@@ -5476,17 +5500,17 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
if (_tmp13_ == NULL) {
#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = TRUE;
-#line 5480 "Photo.c"
+#line 5504 "Photo.c"
} else {
- PhotoFileInterrogator* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ PhotoFileInterrogator* _tmp14_;
+ gboolean _tmp15_;
#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = interrogator;
#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_);
#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _tmp15_;
-#line 5490 "Photo.c"
+#line 5514 "Photo.c"
}
#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
@@ -5500,7 +5524,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_g_object_unref0 (file);
#line 654 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5504 "Photo.c"
+#line 5528 "Photo.c"
}
#line 657 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = bpr;
@@ -5532,10 +5556,10 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_tmp27_ = _tmp26_->metadata;
#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp27_ != NULL) {
-#line 5536 "Photo.c"
- DetectedPhotoInformation* _tmp28_ = NULL;
- PhotoMetadata* _tmp29_ = NULL;
- Orientation _tmp30_ = 0;
+#line 5560 "Photo.c"
+ DetectedPhotoInformation* _tmp28_;
+ PhotoMetadata* _tmp29_;
+ Orientation _tmp30_;
#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = detected;
#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5544,11 +5568,11 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_tmp30_ = photo_metadata_get_orientation (_tmp29_);
#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = _tmp30_;
-#line 5548 "Photo.c"
+#line 5572 "Photo.c"
} else {
#line 661 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5552 "Photo.c"
+#line 5576 "Photo.c"
}
#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = bpr;
@@ -5578,7 +5602,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_g_object_unref0 (file);
#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5582 "Photo.c"
+#line 5606 "Photo.c"
}
#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = photo_table_get_instance ();
@@ -5610,7 +5634,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_g_object_unref0 (file);
#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5614 "Photo.c"
+#line 5638 "Photo.c"
}
#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (detected);
@@ -5620,14 +5644,14 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
_g_object_unref0 (info);
#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (file);
-#line 5624 "Photo.c"
+#line 5648 "Photo.c"
}
static void photo_develop_photo (Photo* self, RawDeveloper d) {
gboolean wrote_img_to_disk = FALSE;
BackingPhotoRow* bps = NULL;
- RawDeveloper _tmp0_ = 0;
+ RawDeveloper _tmp0_;
GError * _inner_error_ = NULL;
#line 670 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -5641,32 +5665,32 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
switch (_tmp0_) {
#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
case RAW_DEVELOPER_SHOTWELL:
-#line 5645 "Photo.c"
+#line 5669 "Photo.c"
{
{
BackingPhotoRow* _tmp1_ = NULL;
- RawDeveloper _tmp2_ = 0;
- PhotoRow* _tmp3_ = NULL;
- BackingPhotoRow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- BackingPhotoRow* _tmp6_ = NULL;
- BackingPhotoRow* _tmp7_ = NULL;
+ RawDeveloper _tmp2_;
+ PhotoRow* _tmp3_;
+ BackingPhotoRow* _tmp4_;
+ const gchar* _tmp5_;
+ BackingPhotoRow* _tmp6_;
+ BackingPhotoRow* _tmp7_;
GdkPixbuf* pix = NULL;
- GdkPixbuf* _tmp14_ = NULL;
+ GdkPixbuf* _tmp14_;
PhotoFileWriter* writer = NULL;
- BackingPhotoRow* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- PhotoFileWriter* _tmp22_ = NULL;
- PhotoFileWriter* _tmp23_ = NULL;
- GdkPixbuf* _tmp24_ = NULL;
+ BackingPhotoRow* _tmp20_;
+ const gchar* _tmp21_;
+ PhotoFileWriter* _tmp22_;
+ PhotoFileWriter* _tmp23_;
+ GdkPixbuf* _tmp24_;
PhotoMetadata* meta = NULL;
- PhotoMetadata* _tmp25_ = NULL;
+ PhotoMetadata* _tmp25_;
PhotoFileMetadataWriter* mwriter = NULL;
- BackingPhotoRow* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
- PhotoFileMetadataWriter* _tmp28_ = NULL;
- PhotoFileMetadataWriter* _tmp29_ = NULL;
- PhotoMetadata* _tmp30_ = NULL;
+ BackingPhotoRow* _tmp26_;
+ const gchar* _tmp27_;
+ PhotoFileMetadataWriter* _tmp28_;
+ PhotoFileMetadataWriter* _tmp29_;
+ PhotoMetadata* _tmp30_;
#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = d;
#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5681,8 +5705,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_tmp1_ = _tmp6_;
#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5685 "Photo.c"
- goto __catch265_g_error;
+#line 5709 "Photo.c"
+ goto __catch266_g_error;
}
#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _tmp1_;
@@ -5694,19 +5718,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
bps = _tmp7_;
#line 679 "/home/jens/Source/shotwell/src/Photo.vala"
pix = NULL;
-#line 5698 "Photo.c"
+#line 5722 "Photo.c"
{
- PhotoBackingReaders* _tmp8_ = NULL;
+ PhotoBackingReaders* _tmp8_;
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->priv->readers;
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 5705 "Photo.c"
+#line 5729 "Photo.c"
{
GdkPixbuf* _tmp9_ = NULL;
Scaling _tmp10_ = {0};
- GdkPixbuf* _tmp11_ = NULL;
- GdkPixbuf* _tmp12_ = NULL;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
scaling_for_original (&_tmp10_);
#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5715,8 +5739,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_tmp9_ = _tmp11_;
#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5719 "Photo.c"
- goto __finally266;
+#line 5743 "Photo.c"
+ goto __finally267;
}
#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _tmp9_;
@@ -5728,16 +5752,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
pix = _tmp12_;
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp9_);
-#line 5732 "Photo.c"
+#line 5756 "Photo.c"
}
- __finally266:
+ __finally267:
{
- PhotoBackingReaders* _tmp13_ = NULL;
+ PhotoBackingReaders* _tmp13_;
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->priv->readers;
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 5741 "Photo.c"
+#line 5765 "Photo.c"
}
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5745,8 +5769,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5749 "Photo.c"
- goto __catch265_g_error;
+#line 5773 "Photo.c"
+ goto __catch266_g_error;
}
}
#line 688 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5759,17 +5783,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 690 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5763 "Photo.c"
+#line 5787 "Photo.c"
{
- gboolean _tmp15_ = FALSE;
+ gboolean _tmp15_;
#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = wrote_img_to_disk;
#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_) {
-#line 5770 "Photo.c"
+#line 5794 "Photo.c"
{
- RawDeveloper _tmp16_ = 0;
- BackingPhotoRow* _tmp17_ = NULL;
+ RawDeveloper _tmp16_;
+ BackingPhotoRow* _tmp17_;
#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = d;
#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5778,19 +5802,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_);
#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5782 "Photo.c"
- goto __catch267_g_error;
+#line 5806 "Photo.c"
+ goto __catch268_g_error;
}
#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 5787 "Photo.c"
+#line 5811 "Photo.c"
}
- goto __finally267;
- __catch267_g_error:
+ goto __finally268;
+ __catch268_g_error:
{
GError* e = NULL;
- GError* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
+ GError* _tmp18_;
+ const gchar* _tmp19_;
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5803,13 +5827,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_);
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 5807 "Photo.c"
+#line 5831 "Photo.c"
}
- __finally267:
+ __finally268:
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5812 "Photo.c"
- goto __catch265_g_error;
+#line 5836 "Photo.c"
+ goto __catch266_g_error;
}
}
}
@@ -5817,7 +5841,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_backing_photo_row_unref0 (bps);
#line 690 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 5821 "Photo.c"
+#line 5845 "Photo.c"
}
#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = bps;
@@ -5833,8 +5857,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5837 "Photo.c"
- goto __catch265_g_error;
+#line 5861 "Photo.c"
+ goto __catch266_g_error;
}
#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = writer;
@@ -5850,8 +5874,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5854 "Photo.c"
- goto __catch265_g_error;
+#line 5878 "Photo.c"
+ goto __catch266_g_error;
}
#line 703 "/home/jens/Source/shotwell/src/Photo.vala"
wrote_img_to_disk = TRUE;
@@ -5867,8 +5891,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5871 "Photo.c"
- goto __catch265_g_error;
+#line 5895 "Photo.c"
+ goto __catch266_g_error;
}
#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = bps;
@@ -5888,8 +5912,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5892 "Photo.c"
- goto __catch265_g_error;
+#line 5916 "Photo.c"
+ goto __catch266_g_error;
}
#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = mwriter;
@@ -5909,8 +5933,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5913 "Photo.c"
- goto __catch265_g_error;
+#line 5937 "Photo.c"
+ goto __catch266_g_error;
}
#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (mwriter);
@@ -5922,14 +5946,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_g_object_unref0 (pix);
#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
-#line 5926 "Photo.c"
+#line 5950 "Photo.c"
}
- goto __finally265;
- __catch265_g_error:
+ goto __finally266;
+ __catch266_g_error:
{
GError* err = NULL;
- GError* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
+ GError* _tmp31_;
+ const gchar* _tmp32_;
#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5942,19 +5966,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_);
#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 5946 "Photo.c"
+#line 5970 "Photo.c"
}
- __finally265:
+ __finally266:
{
- gboolean _tmp33_ = FALSE;
+ gboolean _tmp33_;
#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp33_ = wrote_img_to_disk;
#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp33_) {
-#line 5955 "Photo.c"
+#line 5979 "Photo.c"
{
- RawDeveloper _tmp34_ = 0;
- BackingPhotoRow* _tmp35_ = NULL;
+ RawDeveloper _tmp34_;
+ BackingPhotoRow* _tmp35_;
#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = d;
#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5963,19 +5987,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_);
#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5967 "Photo.c"
- goto __catch268_g_error;
+#line 5991 "Photo.c"
+ goto __catch269_g_error;
}
#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 5972 "Photo.c"
+#line 5996 "Photo.c"
}
- goto __finally268;
- __catch268_g_error:
+ goto __finally269;
+ __catch269_g_error:
{
GError* e = NULL;
- GError* _tmp36_ = NULL;
- const gchar* _tmp37_ = NULL;
+ GError* _tmp36_;
+ const gchar* _tmp37_;
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5988,9 +6012,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_);
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 5992 "Photo.c"
+#line 6016 "Photo.c"
}
- __finally268:
+ __finally269:
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6001,7 +6025,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6005 "Photo.c"
+#line 6029 "Photo.c"
}
}
}
@@ -6015,67 +6039,67 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6019 "Photo.c"
+#line 6043 "Photo.c"
}
#line 727 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 6023 "Photo.c"
+#line 6047 "Photo.c"
}
#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
case RAW_DEVELOPER_CAMERA:
-#line 6027 "Photo.c"
+#line 6051 "Photo.c"
{
#line 731 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 6031 "Photo.c"
+#line 6055 "Photo.c"
}
#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
case RAW_DEVELOPER_EMBEDDED:
-#line 6035 "Photo.c"
+#line 6059 "Photo.c"
{
{
PhotoMetadata* meta = NULL;
- PhotoMetadata* _tmp38_ = NULL;
+ PhotoMetadata* _tmp38_;
guint c = 0U;
- PhotoMetadata* _tmp39_ = NULL;
- guint _tmp40_ = 0U;
- guint _tmp41_ = 0U;
+ PhotoMetadata* _tmp39_;
+ guint _tmp40_;
+ guint _tmp41_;
PhotoPreview* prev = NULL;
- PhotoMetadata* _tmp47_ = NULL;
- guint _tmp48_ = 0U;
- PhotoPreview* _tmp49_ = NULL;
- PhotoPreview* _tmp50_ = NULL;
+ PhotoMetadata* _tmp47_;
+ guint _tmp48_;
+ PhotoPreview* _tmp49_;
+ PhotoPreview* _tmp50_;
GdkPixbuf* pix = NULL;
- PhotoPreview* _tmp56_ = NULL;
- GdkPixbuf* _tmp57_ = NULL;
- GdkPixbuf* _tmp58_ = NULL;
+ PhotoPreview* _tmp56_;
+ GdkPixbuf* _tmp57_;
+ GdkPixbuf* _tmp58_;
BackingPhotoRow* _tmp64_ = NULL;
- RawDeveloper _tmp65_ = 0;
- PhotoRow* _tmp66_ = NULL;
- BackingPhotoRow* _tmp67_ = NULL;
- const gchar* _tmp68_ = NULL;
- BackingPhotoRow* _tmp69_ = NULL;
- BackingPhotoRow* _tmp70_ = NULL;
+ RawDeveloper _tmp65_;
+ PhotoRow* _tmp66_;
+ BackingPhotoRow* _tmp67_;
+ const gchar* _tmp68_;
+ BackingPhotoRow* _tmp69_;
+ BackingPhotoRow* _tmp70_;
PhotoFileWriter* writer = NULL;
- BackingPhotoRow* _tmp71_ = NULL;
- const gchar* _tmp72_ = NULL;
- PhotoFileWriter* _tmp73_ = NULL;
- PhotoFileWriter* _tmp74_ = NULL;
- GdkPixbuf* _tmp75_ = NULL;
+ BackingPhotoRow* _tmp71_;
+ const gchar* _tmp72_;
+ PhotoFileWriter* _tmp73_;
+ PhotoFileWriter* _tmp74_;
+ GdkPixbuf* _tmp75_;
PhotoFileMetadataWriter* mwriter = NULL;
- BackingPhotoRow* _tmp76_ = NULL;
- const gchar* _tmp77_ = NULL;
- PhotoFileMetadataWriter* _tmp78_ = NULL;
- PhotoFileMetadataWriter* _tmp79_ = NULL;
- PhotoMetadata* _tmp80_ = NULL;
+ BackingPhotoRow* _tmp76_;
+ const gchar* _tmp77_;
+ PhotoFileMetadataWriter* _tmp78_;
+ PhotoFileMetadataWriter* _tmp79_;
+ PhotoMetadata* _tmp80_;
#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = photo_get_master_metadata (self, &_inner_error_);
#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
meta = _tmp38_;
#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6078 "Photo.c"
- goto __catch269_g_error;
+#line 6102 "Photo.c"
+ goto __catch270_g_error;
}
#line 737 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = meta;
@@ -6089,17 +6113,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
if (_tmp41_ <= ((guint) 0)) {
#line 739 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6093 "Photo.c"
+#line 6117 "Photo.c"
{
- gboolean _tmp42_ = FALSE;
+ gboolean _tmp42_;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = wrote_img_to_disk;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp42_) {
-#line 6100 "Photo.c"
+#line 6124 "Photo.c"
{
- RawDeveloper _tmp43_ = 0;
- BackingPhotoRow* _tmp44_ = NULL;
+ RawDeveloper _tmp43_;
+ BackingPhotoRow* _tmp44_;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = d;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6108,19 +6132,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_);
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6112 "Photo.c"
- goto __catch270_g_error;
+#line 6136 "Photo.c"
+ goto __catch271_g_error;
}
#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 6117 "Photo.c"
+#line 6141 "Photo.c"
}
- goto __finally270;
- __catch270_g_error:
+ goto __finally271;
+ __catch271_g_error:
{
GError* e = NULL;
- GError* _tmp45_ = NULL;
- const gchar* _tmp46_ = NULL;
+ GError* _tmp45_;
+ const gchar* _tmp46_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6133,13 +6157,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_);
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6137 "Photo.c"
+#line 6161 "Photo.c"
}
- __finally270:
+ __finally271:
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6142 "Photo.c"
- goto __catch269_g_error;
+#line 6166 "Photo.c"
+ goto __catch270_g_error;
}
}
}
@@ -6147,7 +6171,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_backing_photo_row_unref0 (bps);
#line 739 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6151 "Photo.c"
+#line 6175 "Photo.c"
}
#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = meta;
@@ -6167,17 +6191,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 743 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6171 "Photo.c"
+#line 6195 "Photo.c"
{
- gboolean _tmp51_ = FALSE;
+ gboolean _tmp51_;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp51_ = wrote_img_to_disk;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp51_) {
-#line 6178 "Photo.c"
+#line 6202 "Photo.c"
{
- RawDeveloper _tmp52_ = 0;
- BackingPhotoRow* _tmp53_ = NULL;
+ RawDeveloper _tmp52_;
+ BackingPhotoRow* _tmp53_;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = d;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6186,19 +6210,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_);
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6190 "Photo.c"
- goto __catch271_g_error;
+#line 6214 "Photo.c"
+ goto __catch272_g_error;
}
#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 6195 "Photo.c"
+#line 6219 "Photo.c"
}
- goto __finally271;
- __catch271_g_error:
+ goto __finally272;
+ __catch272_g_error:
{
GError* e = NULL;
- GError* _tmp54_ = NULL;
- const gchar* _tmp55_ = NULL;
+ GError* _tmp54_;
+ const gchar* _tmp55_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6211,13 +6235,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_);
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6215 "Photo.c"
+#line 6239 "Photo.c"
}
- __finally271:
+ __finally272:
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6220 "Photo.c"
- goto __catch269_g_error;
+#line 6244 "Photo.c"
+ goto __catch270_g_error;
}
}
}
@@ -6225,7 +6249,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_backing_photo_row_unref0 (bps);
#line 743 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6229 "Photo.c"
+#line 6253 "Photo.c"
}
#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp56_ = prev;
@@ -6239,8 +6263,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6243 "Photo.c"
- goto __catch269_g_error;
+#line 6267 "Photo.c"
+ goto __catch270_g_error;
}
#line 747 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = pix;
@@ -6254,17 +6278,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 749 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6258 "Photo.c"
+#line 6282 "Photo.c"
{
- gboolean _tmp59_ = FALSE;
+ gboolean _tmp59_;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = wrote_img_to_disk;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp59_) {
-#line 6265 "Photo.c"
+#line 6289 "Photo.c"
{
- RawDeveloper _tmp60_ = 0;
- BackingPhotoRow* _tmp61_ = NULL;
+ RawDeveloper _tmp60_;
+ BackingPhotoRow* _tmp61_;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp60_ = d;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6273,19 +6297,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_);
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6277 "Photo.c"
- goto __catch272_g_error;
+#line 6301 "Photo.c"
+ goto __catch273_g_error;
}
#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 6282 "Photo.c"
+#line 6306 "Photo.c"
}
- goto __finally272;
- __catch272_g_error:
+ goto __finally273;
+ __catch273_g_error:
{
GError* e = NULL;
- GError* _tmp62_ = NULL;
- const gchar* _tmp63_ = NULL;
+ GError* _tmp62_;
+ const gchar* _tmp63_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6298,13 +6322,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_);
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6302 "Photo.c"
+#line 6326 "Photo.c"
}
- __finally272:
+ __finally273:
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6307 "Photo.c"
- goto __catch269_g_error;
+#line 6331 "Photo.c"
+ goto __catch270_g_error;
}
}
}
@@ -6312,7 +6336,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_backing_photo_row_unref0 (bps);
#line 749 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6316 "Photo.c"
+#line 6340 "Photo.c"
}
#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp65_ = d;
@@ -6334,8 +6358,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6338 "Photo.c"
- goto __catch269_g_error;
+#line 6362 "Photo.c"
+ goto __catch270_g_error;
}
#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp70_ = _tmp64_;
@@ -6363,8 +6387,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6367 "Photo.c"
- goto __catch269_g_error;
+#line 6391 "Photo.c"
+ goto __catch270_g_error;
}
#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp74_ = writer;
@@ -6384,8 +6408,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6388 "Photo.c"
- goto __catch269_g_error;
+#line 6412 "Photo.c"
+ goto __catch270_g_error;
}
#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
wrote_img_to_disk = TRUE;
@@ -6409,8 +6433,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6413 "Photo.c"
- goto __catch269_g_error;
+#line 6437 "Photo.c"
+ goto __catch270_g_error;
}
#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp79_ = mwriter;
@@ -6432,8 +6456,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6436 "Photo.c"
- goto __catch269_g_error;
+#line 6460 "Photo.c"
+ goto __catch270_g_error;
}
#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (mwriter);
@@ -6447,14 +6471,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_photo_preview_unref0 (prev);
#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (meta);
-#line 6451 "Photo.c"
+#line 6475 "Photo.c"
}
- goto __finally269;
- __catch269_g_error:
+ goto __finally270;
+ __catch270_g_error:
{
GError* e = NULL;
- GError* _tmp81_ = NULL;
- const gchar* _tmp82_ = NULL;
+ GError* _tmp81_;
+ const gchar* _tmp82_;
#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6467,17 +6491,17 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_);
#line 766 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6471 "Photo.c"
+#line 6495 "Photo.c"
{
- gboolean _tmp83_ = FALSE;
+ gboolean _tmp83_;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp83_ = wrote_img_to_disk;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp83_) {
-#line 6478 "Photo.c"
+#line 6502 "Photo.c"
{
- RawDeveloper _tmp84_ = 0;
- BackingPhotoRow* _tmp85_ = NULL;
+ RawDeveloper _tmp84_;
+ BackingPhotoRow* _tmp85_;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp84_ = d;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6486,19 +6510,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_);
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6490 "Photo.c"
- goto __catch273_g_error;
+#line 6514 "Photo.c"
+ goto __catch274_g_error;
}
#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 6495 "Photo.c"
+#line 6519 "Photo.c"
}
- goto __finally273;
- __catch273_g_error:
+ goto __finally274;
+ __catch274_g_error:
{
GError* e = NULL;
- GError* _tmp86_ = NULL;
- const gchar* _tmp87_ = NULL;
+ GError* _tmp86_;
+ const gchar* _tmp87_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6511,14 +6535,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_);
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6515 "Photo.c"
+#line 6539 "Photo.c"
}
- __finally273:
+ __finally274:
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bps);
-#line 6522 "Photo.c"
+#line 6546 "Photo.c"
}
}
}
@@ -6526,19 +6550,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
_backing_photo_row_unref0 (bps);
#line 766 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6530 "Photo.c"
+#line 6554 "Photo.c"
}
- __finally269:
+ __finally270:
{
- gboolean _tmp88_ = FALSE;
+ gboolean _tmp88_;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp88_ = wrote_img_to_disk;
#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp88_) {
-#line 6539 "Photo.c"
+#line 6563 "Photo.c"
{
- RawDeveloper _tmp89_ = 0;
- BackingPhotoRow* _tmp90_ = NULL;
+ RawDeveloper _tmp89_;
+ BackingPhotoRow* _tmp90_;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp89_ = d;
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6547,19 +6571,19 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_);
#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6551 "Photo.c"
- goto __catch274_g_error;
+#line 6575 "Photo.c"
+ goto __catch275_g_error;
}
#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_raw_development_modified (self);
-#line 6556 "Photo.c"
+#line 6580 "Photo.c"
}
- goto __finally274;
- __catch274_g_error:
+ goto __finally275;
+ __catch275_g_error:
{
GError* e = NULL;
- GError* _tmp91_ = NULL;
- const gchar* _tmp92_ = NULL;
+ GError* _tmp91_;
+ const gchar* _tmp92_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6572,9 +6596,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_);
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6576 "Photo.c"
+#line 6600 "Photo.c"
}
- __finally274:
+ __finally275:
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6585,7 +6609,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6589 "Photo.c"
+#line 6613 "Photo.c"
}
}
}
@@ -6599,22 +6623,22 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6603 "Photo.c"
+#line 6627 "Photo.c"
}
#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 6607 "Photo.c"
+#line 6631 "Photo.c"
}
default:
{
#line 783 "/home/jens/Source/shotwell/src/Photo.vala"
g_assert_not_reached ();
-#line 6613 "Photo.c"
+#line 6637 "Photo.c"
}
}
#line 670 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bps);
-#line 6618 "Photo.c"
+#line 6642 "Photo.c"
}
@@ -6622,33 +6646,33 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
GError * _inner_error_ = NULL;
#line 788 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
-#line 6626 "Photo.c"
+#line 6650 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 6633 "Photo.c"
+#line 6657 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- RawDeveloper _tmp2_ = 0;
+ PhotoRow* _tmp1_;
+ RawDeveloper _tmp2_;
#line 790 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 790 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = d;
#line 790 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_->developer = _tmp2_;
-#line 6643 "Photo.c"
+#line 6667 "Photo.c"
}
- __finally275:
+ __finally276:
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 6652 "Photo.c"
+#line 6676 "Photo.c"
}
#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6658,19 +6682,19 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6662 "Photo.c"
+#line 6686 "Photo.c"
}
}
}
void photo_set_raw_developer (Photo* self, RawDeveloper d) {
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp4_ = FALSE;
- Alteration* _tmp48_ = NULL;
- Alteration* _tmp49_ = NULL;
+ gboolean _tmp2_;
+ gboolean _tmp4_;
+ Alteration* _tmp48_;
+ Alteration* _tmp49_;
GError * _inner_error_ = NULL;
#line 795 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -6680,29 +6704,29 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
#line 797 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6684 "Photo.c"
+#line 6708 "Photo.c"
}
#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA);
#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 6690 "Photo.c"
- RawDeveloper _tmp3_ = 0;
+#line 6714 "Photo.c"
+ RawDeveloper _tmp3_;
#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = d;
#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 6696 "Photo.c"
+#line 6720 "Photo.c"
} else {
#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 6700 "Photo.c"
+#line 6724 "Photo.c"
}
#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
#line 803 "/home/jens/Source/shotwell/src/Photo.vala"
d = RAW_DEVELOPER_CAMERA;
-#line 6706 "Photo.c"
+#line 6730 "Photo.c"
}
#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
@@ -6710,39 +6734,39 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
if (!_tmp4_) {
#line 808 "/home/jens/Source/shotwell/src/Photo.vala"
d = RAW_DEVELOPER_SHOTWELL;
-#line 6714 "Photo.c"
+#line 6738 "Photo.c"
}
{
- GeeHashMap* _tmp5_ = NULL;
+ GeeHashMap* _tmp5_;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->developments;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6722 "Photo.c"
+#line 6746 "Photo.c"
{
RawDeveloper stale_raw_developer = 0;
- PhotoRow* _tmp6_ = NULL;
- RawDeveloper _tmp7_ = 0;
- RawDeveloper _tmp8_ = 0;
- gboolean _tmp9_ = FALSE;
- GeeHashMap* _tmp11_ = NULL;
- RawDeveloper _tmp12_ = 0;
- gboolean _tmp13_ = FALSE;
- PhotoRow* _tmp15_ = NULL;
- RawDeveloper _tmp16_ = 0;
- GeeHashMap* _tmp17_ = NULL;
- RawDeveloper _tmp18_ = 0;
- gpointer _tmp19_ = NULL;
- PhotoBackingReaders* _tmp20_ = NULL;
- BackingPhotoRow* _tmp21_ = NULL;
- PhotoFileFormat _tmp22_ = 0;
- BackingPhotoRow* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- PhotoFileReader* _tmp25_ = NULL;
- BackingPhotoRow* _tmp30_ = NULL;
- Orientation _tmp31_ = 0;
+ PhotoRow* _tmp6_;
+ RawDeveloper _tmp7_;
+ RawDeveloper _tmp8_;
+ gboolean _tmp9_;
+ GeeHashMap* _tmp11_;
+ RawDeveloper _tmp12_;
+ gboolean _tmp13_;
+ PhotoRow* _tmp15_;
+ RawDeveloper _tmp16_;
+ GeeHashMap* _tmp17_;
+ RawDeveloper _tmp18_;
+ gpointer _tmp19_;
+ PhotoBackingReaders* _tmp20_;
+ BackingPhotoRow* _tmp21_;
+ PhotoFileFormat _tmp22_;
+ BackingPhotoRow* _tmp23_;
+ const gchar* _tmp24_;
+ PhotoFileReader* _tmp25_;
+ BackingPhotoRow* _tmp30_;
+ Orientation _tmp31_;
gboolean _tmp41_ = FALSE;
- RawDeveloper _tmp42_ = 0;
+ RawDeveloper _tmp42_;
#line 811 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 811 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6755,13 +6779,13 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_tmp9_ = photo_is_raw_developer_complete (self, _tmp8_);
#line 814 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp9_) {
-#line 6759 "Photo.c"
- RawDeveloper _tmp10_ = 0;
+#line 6783 "Photo.c"
+ RawDeveloper _tmp10_;
#line 815 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = d;
#line 815 "/home/jens/Source/shotwell/src/Photo.vala"
photo_develop_photo (self, _tmp10_);
-#line 6765 "Photo.c"
+#line 6789 "Photo.c"
}
#line 817 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->priv->developments;
@@ -6771,18 +6795,18 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_));
#line 817 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp13_) {
-#line 6775 "Photo.c"
+#line 6799 "Photo.c"
{
- GeeHashMap* _tmp14_ = NULL;
+ GeeHashMap* _tmp14_;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->priv->developments;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6782 "Photo.c"
+#line 6806 "Photo.c"
}
#line 818 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6786 "Photo.c"
+#line 6810 "Photo.c"
}
#line 821 "/home/jens/Source/shotwell/src/Photo.vala"
photo_revert_to_master (self, FALSE);
@@ -6818,10 +6842,10 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_photo_file_adapter_unref0 (_tmp20_->developer);
#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_->developer = _tmp25_;
-#line 6822 "Photo.c"
+#line 6846 "Photo.c"
{
- GdkPixbuf* _tmp26_ = NULL;
- GdkPixbuf* _tmp27_ = NULL;
+ GdkPixbuf* _tmp26_;
+ GdkPixbuf* _tmp27_;
#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = photo_get_prefetched_copy (self, &_inner_error_);
#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6830,12 +6854,12 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_g_object_unref0 (_tmp27_);
#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6834 "Photo.c"
- goto __catch277_g_error;
+#line 6858 "Photo.c"
+ goto __catch278_g_error;
}
}
- goto __finally277;
- __catch277_g_error:
+ goto __finally278;
+ __catch278_g_error:
{
GError* e = NULL;
#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6844,30 +6868,30 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_inner_error_ = NULL;
#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6848 "Photo.c"
+#line 6872 "Photo.c"
{
- GeeHashMap* _tmp28_ = NULL;
+ GeeHashMap* _tmp28_;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = self->priv->developments;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6855 "Photo.c"
+#line 6879 "Photo.c"
}
#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6859 "Photo.c"
+#line 6883 "Photo.c"
}
- __finally277:
+ __finally278:
#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6864 "Photo.c"
+#line 6888 "Photo.c"
{
- GeeHashMap* _tmp29_ = NULL;
+ GeeHashMap* _tmp29_;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = self->priv->developments;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6871 "Photo.c"
+#line 6895 "Photo.c"
}
#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6875,7 +6899,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6879 "Photo.c"
+#line 6903 "Photo.c"
}
#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = self->backing_photo_row;
@@ -6883,14 +6907,14 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_tmp31_ = _tmp30_->original_orientation;
#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_orientation (self, _tmp31_);
-#line 6887 "Photo.c"
+#line 6911 "Photo.c"
{
- PhotoTable* _tmp32_ = NULL;
- PhotoTable* _tmp33_ = NULL;
- PhotoRow* _tmp34_ = NULL;
- RawDeveloper _tmp35_ = 0;
- BackingPhotoRow* _tmp36_ = NULL;
- BackingPhotoID _tmp37_ = {0};
+ PhotoTable* _tmp32_;
+ PhotoTable* _tmp33_;
+ PhotoRow* _tmp34_;
+ RawDeveloper _tmp35_;
+ BackingPhotoRow* _tmp36_;
+ BackingPhotoID _tmp37_;
#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = photo_table_get_instance ();
#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6909,16 +6933,16 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_database_table_unref0 (_tmp33_);
#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6913 "Photo.c"
- goto __catch278_g_error;
+#line 6937 "Photo.c"
+ goto __catch279_g_error;
}
}
- goto __finally278;
- __catch278_g_error:
+ goto __finally279;
+ __catch279_g_error:
{
GError* e = NULL;
- GError* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
+ GError* _tmp38_;
+ const gchar* _tmp39_;
#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6931,19 +6955,19 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
g_warning ("Photo.vala:840: Error updating database: %s", _tmp39_);
#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 6935 "Photo.c"
+#line 6959 "Photo.c"
}
- __finally278:
+ __finally279:
#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6940 "Photo.c"
+#line 6964 "Photo.c"
{
- GeeHashMap* _tmp40_ = NULL;
+ GeeHashMap* _tmp40_;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = self->priv->developments;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6947 "Photo.c"
+#line 6971 "Photo.c"
}
#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6951,16 +6975,16 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 6955 "Photo.c"
+#line 6979 "Photo.c"
}
#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = stale_raw_developer;
#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp42_ != RAW_DEVELOPER_CAMERA) {
-#line 6961 "Photo.c"
- RawDeveloper _tmp43_ = 0;
- PhotoRow* _tmp44_ = NULL;
- RawDeveloper _tmp45_ = 0;
+#line 6985 "Photo.c"
+ RawDeveloper _tmp43_;
+ PhotoRow* _tmp44_;
+ RawDeveloper _tmp45_;
#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = stale_raw_developer;
#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6969,31 +6993,31 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_tmp45_ = _tmp44_->developer;
#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = _tmp43_ != _tmp45_;
-#line 6973 "Photo.c"
+#line 6997 "Photo.c"
} else {
#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = FALSE;
-#line 6977 "Photo.c"
+#line 7001 "Photo.c"
}
#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp41_) {
-#line 6981 "Photo.c"
- RawDeveloper _tmp46_ = 0;
+#line 7005 "Photo.c"
+ RawDeveloper _tmp46_;
#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = stale_raw_developer;
#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
photo_delete_raw_development (self, _tmp46_);
-#line 6987 "Photo.c"
+#line 7011 "Photo.c"
}
}
- __finally276:
+ __finally277:
{
- GeeHashMap* _tmp47_ = NULL;
+ GeeHashMap* _tmp47_;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = self->priv->developments;
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6997 "Photo.c"
+#line 7021 "Photo.c"
}
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7003,7 +7027,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 7007 "Photo.c"
+#line 7031 "Photo.c"
}
}
#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7016,14 +7040,14 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
_alteration_unref0 (_tmp49_);
#line 859 "/home/jens/Source/shotwell/src/Photo.vala"
photo_discard_prefetched (self);
-#line 7020 "Photo.c"
+#line 7044 "Photo.c"
}
RawDeveloper photo_get_raw_developer (Photo* self) {
RawDeveloper result = 0;
- PhotoRow* _tmp0_ = NULL;
- RawDeveloper _tmp1_ = 0;
+ PhotoRow* _tmp0_;
+ RawDeveloper _tmp1_;
#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7034,7 +7058,7 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
result = _tmp1_;
#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7038 "Photo.c"
+#line 7062 "Photo.c"
}
@@ -7046,32 +7070,32 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 869 "/home/jens/Source/shotwell/src/Photo.vala"
ret = FALSE;
-#line 7050 "Photo.c"
+#line 7074 "Photo.c"
{
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->developments;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7057 "Photo.c"
- {
- GeeHashMap* _tmp1_ = NULL;
- RawDeveloper _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- RawDeveloper _tmp7_ = 0;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+#line 7081 "Photo.c"
+ {
+ GeeHashMap* _tmp1_;
+ RawDeveloper _tmp2_;
+ gboolean _tmp3_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ RawDeveloper _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
BackingPhotoRow* bpr = NULL;
- GeeHashMap* _tmp10_ = NULL;
- RawDeveloper _tmp11_ = 0;
- gpointer _tmp12_ = NULL;
- BackingPhotoRow* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- GeeHashMap* _tmp39_ = NULL;
- RawDeveloper _tmp40_ = 0;
- gboolean _tmp41_ = FALSE;
+ GeeHashMap* _tmp10_;
+ RawDeveloper _tmp11_;
+ gpointer _tmp12_;
+ BackingPhotoRow* _tmp13_;
+ const gchar* _tmp14_;
+ GeeHashMap* _tmp39_;
+ RawDeveloper _tmp40_;
+ gboolean _tmp41_;
#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->developments;
#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7082,18 +7106,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
if (!_tmp3_) {
#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
-#line 7086 "Photo.c"
+#line 7110 "Photo.c"
{
- GeeHashMap* _tmp4_ = NULL;
+ GeeHashMap* _tmp4_;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->developments;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7093 "Photo.c"
+#line 7117 "Photo.c"
}
#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7097 "Photo.c"
+#line 7121 "Photo.c"
}
#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -7125,11 +7149,11 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
_tmp14_ = _tmp13_->filepath;
#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_ != NULL) {
-#line 7129 "Photo.c"
+#line 7153 "Photo.c"
GFile* f = NULL;
- BackingPhotoRow* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
+ BackingPhotoRow* _tmp15_;
+ const gchar* _tmp16_;
+ GFile* _tmp17_;
#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = bpr;
#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7138,45 +7162,45 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
_tmp17_ = g_file_new_for_path (_tmp16_);
#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
f = _tmp17_;
-#line 7142 "Photo.c"
+#line 7166 "Photo.c"
{
- RawDeveloper _tmp18_ = 0;
+ RawDeveloper _tmp18_;
#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = d;
#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_ == RAW_DEVELOPER_CAMERA) {
-#line 7149 "Photo.c"
- GFile* _tmp19_ = NULL;
+#line 7173 "Photo.c"
+ GFile* _tmp19_;
#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = f;
#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
g_file_trash (_tmp19_, NULL, &_inner_error_);
#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7157 "Photo.c"
- goto __catch280_g_error;
+#line 7181 "Photo.c"
+ goto __catch281_g_error;
}
} else {
- GFile* _tmp20_ = NULL;
+ GFile* _tmp20_;
#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = f;
#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
g_file_delete (_tmp20_, NULL, &_inner_error_);
#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7168 "Photo.c"
- goto __catch280_g_error;
+#line 7192 "Photo.c"
+ goto __catch281_g_error;
}
}
}
- goto __finally280;
- __catch280_g_error:
+ goto __finally281;
+ __catch281_g_error:
{
GError* e = NULL;
- BackingPhotoRow* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- GError* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
+ BackingPhotoRow* _tmp21_;
+ const gchar* _tmp22_;
+ GError* _tmp23_;
+ const gchar* _tmp24_;
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7193,12 +7217,12 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
g_warning ("Photo.vala:887: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 7197 "Photo.c"
+#line 7221 "Photo.c"
}
- __finally280:
+ __finally281:
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7202 "Photo.c"
+#line 7226 "Photo.c"
gboolean _tmp26_ = FALSE;
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
@@ -7208,14 +7232,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
_g_object_unref0 (f);
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bpr);
-#line 7212 "Photo.c"
+#line 7236 "Photo.c"
{
- GeeHashMap* _tmp25_ = NULL;
+ GeeHashMap* _tmp25_;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = self->priv->developments;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7219 "Photo.c"
+#line 7243 "Photo.c"
}
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7223,21 +7247,21 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp26_;
-#line 7227 "Photo.c"
+#line 7251 "Photo.c"
}
#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 7231 "Photo.c"
+#line 7255 "Photo.c"
}
{
- PhotoTable* _tmp27_ = NULL;
- PhotoTable* _tmp28_ = NULL;
- PhotoRow* _tmp29_ = NULL;
- RawDeveloper _tmp30_ = 0;
- BackingPhotoTable* _tmp31_ = NULL;
- BackingPhotoTable* _tmp32_ = NULL;
- BackingPhotoRow* _tmp33_ = NULL;
- BackingPhotoID _tmp34_ = {0};
+ PhotoTable* _tmp27_;
+ PhotoTable* _tmp28_;
+ PhotoRow* _tmp29_;
+ RawDeveloper _tmp30_;
+ BackingPhotoTable* _tmp31_;
+ BackingPhotoTable* _tmp32_;
+ BackingPhotoRow* _tmp33_;
+ BackingPhotoID _tmp34_;
#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = photo_table_get_instance ();
#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7252,8 +7276,8 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
_database_table_unref0 (_tmp28_);
#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7256 "Photo.c"
- goto __catch281_g_error;
+#line 7280 "Photo.c"
+ goto __catch282_g_error;
}
#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = backing_photo_table_get_instance ();
@@ -7269,16 +7293,16 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
_database_table_unref0 (_tmp32_);
#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7273 "Photo.c"
- goto __catch281_g_error;
+#line 7297 "Photo.c"
+ goto __catch282_g_error;
}
}
- goto __finally281;
- __catch281_g_error:
+ goto __finally282;
+ __catch282_g_error:
{
GError* e = NULL;
- GError* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
+ GError* _tmp35_;
+ const gchar* _tmp36_;
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
e = _inner_error_;
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7291,25 +7315,25 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp36_);
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (e);
-#line 7295 "Photo.c"
+#line 7319 "Photo.c"
}
- __finally281:
+ __finally282:
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7300 "Photo.c"
+#line 7324 "Photo.c"
gboolean _tmp38_ = FALSE;
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bpr);
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bpr);
-#line 7306 "Photo.c"
+#line 7330 "Photo.c"
{
- GeeHashMap* _tmp37_ = NULL;
+ GeeHashMap* _tmp37_;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = self->priv->developments;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7313 "Photo.c"
+#line 7337 "Photo.c"
}
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7317,7 +7341,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp38_;
-#line 7321 "Photo.c"
+#line 7345 "Photo.c"
}
#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = self->priv->developments;
@@ -7329,20 +7353,20 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
ret = _tmp41_;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bpr);
-#line 7333 "Photo.c"
+#line 7357 "Photo.c"
}
- __finally279:
+ __finally280:
{
- GeeHashMap* _tmp42_ = NULL;
+ GeeHashMap* _tmp42_;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = self->priv->developments;
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7342 "Photo.c"
+#line 7366 "Photo.c"
}
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7346 "Photo.c"
+#line 7370 "Photo.c"
gboolean _tmp43_ = FALSE;
#line 871 "/home/jens/Source/shotwell/src/Photo.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);
@@ -7350,7 +7374,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp43_;
-#line 7354 "Photo.c"
+#line 7378 "Photo.c"
}
}
#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7359,7 +7383,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
result = ret;
#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7363 "Photo.c"
+#line 7387 "Photo.c"
}
@@ -7367,20 +7391,20 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
GError * _inner_error_ = NULL;
#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
-#line 7371 "Photo.c"
+#line 7395 "Photo.c"
{
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->developments;
#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7378 "Photo.c"
+#line 7402 "Photo.c"
{
- RawDeveloper _tmp1_ = 0;
+ RawDeveloper _tmp1_;
RawDeveloper dev = 0;
- RawDeveloper _tmp2_ = 0;
- RawDeveloper _tmp3_ = 0;
- RawDeveloper _tmp4_ = 0;
+ RawDeveloper _tmp2_;
+ RawDeveloper _tmp3_;
+ RawDeveloper _tmp4_;
#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = d;
#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7395,22 +7419,22 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
dev = RAW_DEVELOPER_EMBEDDED;
-#line 7399 "Photo.c"
+#line 7423 "Photo.c"
}
#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = dev;
#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_raw_developer (self, _tmp4_);
-#line 7405 "Photo.c"
+#line 7429 "Photo.c"
}
- __finally282:
+ __finally283:
{
- GeeHashMap* _tmp5_ = NULL;
+ GeeHashMap* _tmp5_;
#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->developments;
#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7414 "Photo.c"
+#line 7438 "Photo.c"
}
#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7420,60 +7444,60 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
g_clear_error (&_inner_error_);
#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 7424 "Photo.c"
+#line 7448 "Photo.c"
}
}
}
-static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7437 "Photo.c"
+#line 7461 "Photo.c"
}
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 7443 "Photo.c"
+#line 7467 "Photo.c"
}
-static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7454 "Photo.c"
+#line 7478 "Photo.c"
}
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 7460 "Photo.c"
+#line 7484 "Photo.c"
}
-static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7471 "Photo.c"
+#line 7495 "Photo.c"
}
#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 7477 "Photo.c"
+#line 7501 "Photo.c"
}
@@ -7481,11 +7505,11 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
Photo * self;
BackingFileState** result = NULL;
BackingFileState** backing = NULL;
- BackingFileState** _tmp0_ = NULL;
- gint backing_length1 = 0;
- gint _backing_size_ = 0;
- BackingFileState** _tmp27_ = NULL;
- gint _tmp27__length1 = 0;
+ BackingFileState** _tmp0_;
+ gint backing_length1;
+ gint _backing_size_;
+ BackingFileState** _tmp27_;
+ gint _tmp27__length1;
GError * _inner_error_ = NULL;
#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -7497,24 +7521,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
backing_length1 = 0;
#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_size_ = backing_length1;
-#line 7501 "Photo.c"
+#line 7525 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
+ PhotoRow* _tmp1_;
#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 7508 "Photo.c"
- {
- BackingFileState** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
- PhotoRow* _tmp3_ = NULL;
- BackingPhotoRow* _tmp4_ = NULL;
- PhotoRow* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- BackingFileState* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- gboolean _tmp12_ = FALSE;
+#line 7532 "Photo.c"
+ {
+ BackingFileState** _tmp2_;
+ gint _tmp2__length1;
+ PhotoRow* _tmp3_;
+ BackingPhotoRow* _tmp4_;
+ PhotoRow* _tmp5_;
+ const gchar* _tmp6_;
+ BackingFileState* _tmp7_;
+ gboolean _tmp8_;
+ gboolean _tmp12_;
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = backing;
#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7535,11 +7559,11 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
_tmp8_ = photo_has_editable (self);
#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
-#line 7539 "Photo.c"
- BackingFileState** _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
- BackingPhotoRow* _tmp10_ = NULL;
- BackingFileState* _tmp11_ = NULL;
+#line 7563 "Photo.c"
+ BackingFileState** _tmp9_;
+ gint _tmp9__length1;
+ BackingPhotoRow* _tmp10_;
+ BackingFileState* _tmp11_;
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = backing;
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7550,16 +7574,16 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_);
-#line 7554 "Photo.c"
+#line 7578 "Photo.c"
}
#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_is_developed (self);
#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 7560 "Photo.c"
+#line 7584 "Photo.c"
GeeCollection* dev_rows = NULL;
- GeeCollection* _tmp13_ = NULL;
- GeeCollection* _tmp14_ = NULL;
+ GeeCollection* _tmp13_;
+ GeeCollection* _tmp14_;
#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = photo_get_raw_development_photo_rows (self);
#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7568,11 +7592,11 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
_tmp14_ = dev_rows;
#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_ != NULL) {
-#line 7572 "Photo.c"
+#line 7596 "Photo.c"
{
GeeIterator* _r_it = NULL;
- GeeCollection* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeCollection* _tmp15_;
+ GeeIterator* _tmp16_;
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = dev_rows;
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7581,18 +7605,18 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
_r_it = _tmp16_;
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 7585 "Photo.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 7609 "Photo.c"
+ GeeIterator* _tmp17_;
+ gboolean _tmp18_;
BackingPhotoRow* r = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
- BackingPhotoRow* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- BackingFileState** _tmp23_ = NULL;
- gint _tmp23__length1 = 0;
- BackingPhotoRow* _tmp24_ = NULL;
- BackingFileState* _tmp25_ = NULL;
+ GeeIterator* _tmp19_;
+ gpointer _tmp20_;
+ BackingPhotoRow* _tmp21_;
+ const gchar* _tmp22_;
+ BackingFileState** _tmp23_;
+ gint _tmp23__length1;
+ BackingPhotoRow* _tmp24_;
+ BackingFileState* _tmp25_;
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = _r_it;
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7601,7 +7625,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
if (!_tmp18_) {
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 7605 "Photo.c"
+#line 7629 "Photo.c"
}
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = _r_it;
@@ -7627,26 +7651,26 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
_vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_);
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (r);
-#line 7631 "Photo.c"
+#line 7655 "Photo.c"
}
#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_r_it);
-#line 7635 "Photo.c"
+#line 7659 "Photo.c"
}
}
#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (dev_rows);
-#line 7640 "Photo.c"
+#line 7664 "Photo.c"
}
}
- __finally283:
+ __finally284:
{
- PhotoRow* _tmp26_ = NULL;
+ PhotoRow* _tmp26_;
#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = self->row;
#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7650 "Photo.c"
+#line 7674 "Photo.c"
}
#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7658,7 +7682,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
g_clear_error (&_inner_error_);
#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 7662 "Photo.c"
+#line 7686 "Photo.c"
}
}
#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7669,19 +7693,19 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
if (result_length1) {
#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
*result_length1 = _tmp27__length1;
-#line 7673 "Photo.c"
+#line 7697 "Photo.c"
}
#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp27_;
#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7679 "Photo.c"
+#line 7703 "Photo.c"
}
static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) {
PhotoFileReader* result = NULL;
- BackingFetchMode _tmp0_ = 0;
+ BackingFetchMode _tmp0_;
#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7690,75 +7714,75 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
switch (_tmp0_) {
#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
case BACKING_FETCH_MODE_MASTER:
-#line 7694 "Photo.c"
+#line 7718 "Photo.c"
{
- PhotoFileReader* _tmp1_ = NULL;
+ PhotoFileReader* _tmp1_;
#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_get_master_reader (self);
#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7703 "Photo.c"
+#line 7727 "Photo.c"
}
#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
case BACKING_FETCH_MODE_BASELINE:
-#line 7707 "Photo.c"
+#line 7731 "Photo.c"
{
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoFileReader* _tmp2_;
#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = photo_get_baseline_reader (self);
#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7716 "Photo.c"
+#line 7740 "Photo.c"
}
#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
case BACKING_FETCH_MODE_SOURCE:
-#line 7720 "Photo.c"
+#line 7744 "Photo.c"
{
- PhotoFileReader* _tmp3_ = NULL;
+ PhotoFileReader* _tmp3_;
#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = photo_get_source_reader (self);
#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7729 "Photo.c"
+#line 7753 "Photo.c"
}
#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7733 "Photo.c"
+#line 7757 "Photo.c"
{
- PhotoFileFormat _tmp4_ = 0;
+ PhotoFileFormat _tmp4_;
#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_get_master_file_format (self);
#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
-#line 7740 "Photo.c"
- PhotoFileReader* _tmp5_ = NULL;
+#line 7764 "Photo.c"
+ PhotoFileReader* _tmp5_;
#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = photo_get_raw_developer_reader (self);
#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp5_;
#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7748 "Photo.c"
+#line 7772 "Photo.c"
} else {
- PhotoFileReader* _tmp6_ = NULL;
+ PhotoFileReader* _tmp6_;
#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = photo_get_master_reader (self);
#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp6_;
#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7757 "Photo.c"
+#line 7781 "Photo.c"
}
}
default:
{
- BackingFetchMode _tmp7_ = 0;
+ BackingFetchMode _tmp7_;
GEnumValue* _tmp8_;
#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = mode;
@@ -7766,7 +7790,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
_tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_);
#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
g_error ("Photo.vala:957: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
-#line 7770 "Photo.c"
+#line 7794 "Photo.c"
}
}
}
@@ -7775,7 +7799,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
static gpointer _photo_file_adapter_ref0 (gpointer self) {
#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? photo_file_adapter_ref (self) : NULL;
-#line 7779 "Photo.c"
+#line 7803 "Photo.c"
}
@@ -7784,18 +7808,18 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
GError * _inner_error_ = NULL;
#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7788 "Photo.c"
+#line 7812 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7795 "Photo.c"
+#line 7819 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoFileReader* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoFileReader* _tmp3_;
#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7804,27 +7828,27 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 7808 "Photo.c"
+#line 7832 "Photo.c"
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7815 "Photo.c"
+#line 7839 "Photo.c"
}
#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7819 "Photo.c"
+#line 7843 "Photo.c"
}
- __finally284:
+ __finally285:
{
- PhotoBackingReaders* _tmp5_ = NULL;
+ PhotoBackingReaders* _tmp5_;
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->readers;
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7828 "Photo.c"
+#line 7852 "Photo.c"
}
#line 962 "/home/jens/Source/shotwell/src/Photo.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);
@@ -7832,7 +7856,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
g_clear_error (&_inner_error_);
#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 7836 "Photo.c"
+#line 7860 "Photo.c"
}
}
@@ -7842,18 +7866,18 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
GError * _inner_error_ = NULL;
#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7846 "Photo.c"
+#line 7870 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7853 "Photo.c"
+#line 7877 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoFileReader* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoFileReader* _tmp3_;
#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7862,27 +7886,27 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 7866 "Photo.c"
+#line 7890 "Photo.c"
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7873 "Photo.c"
+#line 7897 "Photo.c"
}
#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7877 "Photo.c"
+#line 7901 "Photo.c"
}
- __finally285:
+ __finally286:
{
- PhotoBackingReaders* _tmp5_ = NULL;
+ PhotoBackingReaders* _tmp5_;
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->readers;
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7886 "Photo.c"
+#line 7910 "Photo.c"
}
#line 968 "/home/jens/Source/shotwell/src/Photo.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);
@@ -7890,7 +7914,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
g_clear_error (&_inner_error_);
#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 7894 "Photo.c"
+#line 7918 "Photo.c"
}
}
@@ -7900,32 +7924,32 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
GError * _inner_error_ = NULL;
#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7904 "Photo.c"
+#line 7928 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7911 "Photo.c"
- {
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoBackingReaders* _tmp7_ = NULL;
- PhotoFileReader* _tmp8_ = NULL;
- PhotoBackingReaders* _tmp13_ = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- PhotoFileReader* _tmp15_ = NULL;
+#line 7935 "Photo.c"
+ {
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoBackingReaders* _tmp7_;
+ PhotoFileReader* _tmp8_;
+ PhotoBackingReaders* _tmp13_;
+ PhotoFileReader* _tmp14_;
+ PhotoFileReader* _tmp15_;
#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 7926 "Photo.c"
- PhotoBackingReaders* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
+#line 7950 "Photo.c"
+ PhotoBackingReaders* _tmp3_;
+ PhotoFileReader* _tmp4_;
+ PhotoFileReader* _tmp5_;
#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7934,18 +7958,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp5_;
-#line 7938 "Photo.c"
+#line 7962 "Photo.c"
{
- PhotoBackingReaders* _tmp6_ = NULL;
+ PhotoBackingReaders* _tmp6_;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->readers;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7945 "Photo.c"
+#line 7969 "Photo.c"
}
#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7949 "Photo.c"
+#line 7973 "Photo.c"
}
#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->readers;
@@ -7953,10 +7977,10 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
_tmp8_ = _tmp7_->developer;
#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ != NULL) {
-#line 7957 "Photo.c"
- PhotoBackingReaders* _tmp9_ = NULL;
- PhotoFileReader* _tmp10_ = NULL;
- PhotoFileReader* _tmp11_ = NULL;
+#line 7981 "Photo.c"
+ PhotoBackingReaders* _tmp9_;
+ PhotoFileReader* _tmp10_;
+ PhotoFileReader* _tmp11_;
#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->priv->readers;
#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7965,18 +7989,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp11_;
-#line 7969 "Photo.c"
+#line 7993 "Photo.c"
{
- PhotoBackingReaders* _tmp12_ = NULL;
+ PhotoBackingReaders* _tmp12_;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->priv->readers;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7976 "Photo.c"
+#line 8000 "Photo.c"
}
#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 7980 "Photo.c"
+#line 8004 "Photo.c"
}
#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->priv->readers;
@@ -7986,27 +8010,27 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp15_;
-#line 7990 "Photo.c"
+#line 8014 "Photo.c"
{
- PhotoBackingReaders* _tmp16_ = NULL;
+ PhotoBackingReaders* _tmp16_;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->priv->readers;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7997 "Photo.c"
+#line 8021 "Photo.c"
}
#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8001 "Photo.c"
+#line 8025 "Photo.c"
}
- __finally286:
+ __finally287:
{
- PhotoBackingReaders* _tmp17_ = NULL;
+ PhotoBackingReaders* _tmp17_;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = self->priv->readers;
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8010 "Photo.c"
+#line 8034 "Photo.c"
}
#line 975 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8014,7 +8038,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
g_clear_error (&_inner_error_);
#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8018 "Photo.c"
+#line 8042 "Photo.c"
}
}
@@ -8024,32 +8048,32 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
GError * _inner_error_ = NULL;
#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8028 "Photo.c"
+#line 8052 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8035 "Photo.c"
- {
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoBackingReaders* _tmp7_ = NULL;
- PhotoFileReader* _tmp8_ = NULL;
- PhotoBackingReaders* _tmp13_ = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- PhotoFileReader* _tmp15_ = NULL;
+#line 8059 "Photo.c"
+ {
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoBackingReaders* _tmp7_;
+ PhotoFileReader* _tmp8_;
+ PhotoBackingReaders* _tmp13_;
+ PhotoFileReader* _tmp14_;
+ PhotoFileReader* _tmp15_;
#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 8050 "Photo.c"
- PhotoBackingReaders* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
+#line 8074 "Photo.c"
+ PhotoBackingReaders* _tmp3_;
+ PhotoFileReader* _tmp4_;
+ PhotoFileReader* _tmp5_;
#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8058,18 +8082,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp5_;
-#line 8062 "Photo.c"
+#line 8086 "Photo.c"
{
- PhotoBackingReaders* _tmp6_ = NULL;
+ PhotoBackingReaders* _tmp6_;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->readers;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8069 "Photo.c"
+#line 8093 "Photo.c"
}
#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8073 "Photo.c"
+#line 8097 "Photo.c"
}
#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->readers;
@@ -8077,10 +8101,10 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
_tmp8_ = _tmp7_->developer;
#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ != NULL) {
-#line 8081 "Photo.c"
- PhotoBackingReaders* _tmp9_ = NULL;
- PhotoFileReader* _tmp10_ = NULL;
- PhotoFileReader* _tmp11_ = NULL;
+#line 8105 "Photo.c"
+ PhotoBackingReaders* _tmp9_;
+ PhotoFileReader* _tmp10_;
+ PhotoFileReader* _tmp11_;
#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->priv->readers;
#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8089,18 +8113,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp11_;
-#line 8093 "Photo.c"
+#line 8117 "Photo.c"
{
- PhotoBackingReaders* _tmp12_ = NULL;
+ PhotoBackingReaders* _tmp12_;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->priv->readers;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8100 "Photo.c"
+#line 8124 "Photo.c"
}
#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8104 "Photo.c"
+#line 8128 "Photo.c"
}
#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->priv->readers;
@@ -8110,27 +8134,27 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp15_;
-#line 8114 "Photo.c"
+#line 8138 "Photo.c"
{
- PhotoBackingReaders* _tmp16_ = NULL;
+ PhotoBackingReaders* _tmp16_;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->priv->readers;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8121 "Photo.c"
+#line 8145 "Photo.c"
}
#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8125 "Photo.c"
+#line 8149 "Photo.c"
}
- __finally287:
+ __finally288:
{
- PhotoBackingReaders* _tmp17_ = NULL;
+ PhotoBackingReaders* _tmp17_;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = self->priv->readers;
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8134 "Photo.c"
+#line 8158 "Photo.c"
}
#line 988 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8138,7 +8162,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
g_clear_error (&_inner_error_);
#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8142 "Photo.c"
+#line 8166 "Photo.c"
}
}
@@ -8148,18 +8172,18 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
GError * _inner_error_ = NULL;
#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8152 "Photo.c"
+#line 8176 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8159 "Photo.c"
+#line 8183 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoFileReader* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoFileReader* _tmp3_;
#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8168,27 +8192,27 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 8172 "Photo.c"
+#line 8196 "Photo.c"
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8179 "Photo.c"
+#line 8203 "Photo.c"
}
#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8183 "Photo.c"
+#line 8207 "Photo.c"
}
- __finally288:
+ __finally289:
{
- PhotoBackingReaders* _tmp5_ = NULL;
+ PhotoBackingReaders* _tmp5_;
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->readers;
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8192 "Photo.c"
+#line 8216 "Photo.c"
}
#line 1001 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8196,7 +8220,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
g_clear_error (&_inner_error_);
#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8200 "Photo.c"
+#line 8224 "Photo.c"
}
}
@@ -8206,45 +8230,45 @@ gboolean photo_is_developed (Photo* self) {
GError * _inner_error_ = NULL;
#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8210 "Photo.c"
+#line 8234 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
gboolean _tmp5_ = FALSE;
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8218 "Photo.c"
+#line 8242 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->developer;
#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_ != NULL;
-#line 8228 "Photo.c"
+#line 8252 "Photo.c"
{
- PhotoBackingReaders* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp3_;
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8235 "Photo.c"
+#line 8259 "Photo.c"
}
#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8239 "Photo.c"
+#line 8263 "Photo.c"
}
- __finally289:
+ __finally290:
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8248 "Photo.c"
+#line 8272 "Photo.c"
}
#line 1007 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8252,7 +8276,7 @@ gboolean photo_is_developed (Photo* self) {
g_clear_error (&_inner_error_);
#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 8256 "Photo.c"
+#line 8280 "Photo.c"
}
}
@@ -8262,45 +8286,45 @@ gboolean photo_has_editable (Photo* self) {
GError * _inner_error_ = NULL;
#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8266 "Photo.c"
+#line 8290 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
gboolean _tmp5_ = FALSE;
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8274 "Photo.c"
+#line 8298 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_ != NULL;
-#line 8284 "Photo.c"
+#line 8308 "Photo.c"
{
- PhotoBackingReaders* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp3_;
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8291 "Photo.c"
+#line 8315 "Photo.c"
}
#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8295 "Photo.c"
+#line 8319 "Photo.c"
}
- __finally290:
+ __finally291:
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8304 "Photo.c"
+#line 8328 "Photo.c"
}
#line 1013 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8308,7 +8332,7 @@ gboolean photo_has_editable (Photo* self) {
g_clear_error (&_inner_error_);
#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 8312 "Photo.c"
+#line 8336 "Photo.c"
}
}
@@ -8318,19 +8342,19 @@ gboolean photo_does_master_exist (Photo* self) {
GError * _inner_error_ = NULL;
#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8322 "Photo.c"
+#line 8346 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
gboolean _tmp6_ = FALSE;
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8330 "Photo.c"
+#line 8354 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ gboolean _tmp3_;
#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8339,27 +8363,27 @@ gboolean photo_does_master_exist (Photo* self) {
_tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 8343 "Photo.c"
+#line 8367 "Photo.c"
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8350 "Photo.c"
+#line 8374 "Photo.c"
}
#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8354 "Photo.c"
+#line 8378 "Photo.c"
}
- __finally291:
+ __finally292:
{
- PhotoBackingReaders* _tmp5_ = NULL;
+ PhotoBackingReaders* _tmp5_;
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->readers;
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8363 "Photo.c"
+#line 8387 "Photo.c"
}
#line 1019 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8367,7 +8391,7 @@ gboolean photo_does_master_exist (Photo* self) {
g_clear_error (&_inner_error_);
#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp6_;
-#line 8371 "Photo.c"
+#line 8395 "Photo.c"
}
}
@@ -8377,29 +8401,29 @@ gboolean photo_does_editable_exist (Photo* self) {
GError * _inner_error_ = NULL;
#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8381 "Photo.c"
+#line 8405 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
gboolean _tmp9_ = FALSE;
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8389 "Photo.c"
+#line 8413 "Photo.c"
{
gboolean _tmp1_ = FALSE;
- PhotoBackingReaders* _tmp2_ = NULL;
- PhotoFileReader* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp2_;
+ PhotoFileReader* _tmp3_;
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->readers;
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp2_->editable;
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp3_ != NULL) {
-#line 8400 "Photo.c"
- PhotoBackingReaders* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 8424 "Photo.c"
+ PhotoBackingReaders* _tmp4_;
+ PhotoFileReader* _tmp5_;
+ gboolean _tmp6_;
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8408,35 +8432,35 @@ gboolean photo_does_editable_exist (Photo* self) {
_tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp6_;
-#line 8412 "Photo.c"
+#line 8436 "Photo.c"
} else {
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 8416 "Photo.c"
+#line 8440 "Photo.c"
}
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
-#line 8420 "Photo.c"
+#line 8444 "Photo.c"
{
- PhotoBackingReaders* _tmp7_ = NULL;
+ PhotoBackingReaders* _tmp7_;
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->readers;
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8427 "Photo.c"
+#line 8451 "Photo.c"
}
#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8431 "Photo.c"
+#line 8455 "Photo.c"
}
- __finally292:
+ __finally293:
{
- PhotoBackingReaders* _tmp8_ = NULL;
+ PhotoBackingReaders* _tmp8_;
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->priv->readers;
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8440 "Photo.c"
+#line 8464 "Photo.c"
}
#line 1026 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8444,7 +8468,7 @@ gboolean photo_does_editable_exist (Photo* self) {
g_clear_error (&_inner_error_);
#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp9_;
-#line 8448 "Photo.c"
+#line 8472 "Photo.c"
}
}
@@ -8454,45 +8478,45 @@ gboolean photo_is_master_baseline (Photo* self) {
GError * _inner_error_ = NULL;
#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8458 "Photo.c"
+#line 8482 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
gboolean _tmp5_ = FALSE;
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8466 "Photo.c"
+#line 8490 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_ == NULL;
-#line 8476 "Photo.c"
+#line 8500 "Photo.c"
{
- PhotoBackingReaders* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp3_;
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8483 "Photo.c"
+#line 8507 "Photo.c"
}
#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8487 "Photo.c"
+#line 8511 "Photo.c"
}
- __finally293:
+ __finally294:
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8496 "Photo.c"
+#line 8520 "Photo.c"
}
#line 1032 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8500,14 +8524,14 @@ gboolean photo_is_master_baseline (Photo* self) {
g_clear_error (&_inner_error_);
#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 8504 "Photo.c"
+#line 8528 "Photo.c"
}
}
gboolean photo_is_master_source (Photo* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8516,7 +8540,7 @@ gboolean photo_is_master_source (Photo* self) {
result = !_tmp0_;
#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8520 "Photo.c"
+#line 8544 "Photo.c"
}
@@ -8525,45 +8549,45 @@ gboolean photo_is_editable_baseline (Photo* self) {
GError * _inner_error_ = NULL;
#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8529 "Photo.c"
+#line 8553 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
gboolean _tmp5_ = FALSE;
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8537 "Photo.c"
+#line 8561 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_ != NULL;
-#line 8547 "Photo.c"
+#line 8571 "Photo.c"
{
- PhotoBackingReaders* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp3_;
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8554 "Photo.c"
+#line 8578 "Photo.c"
}
#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8558 "Photo.c"
+#line 8582 "Photo.c"
}
- __finally294:
+ __finally295:
{
- PhotoBackingReaders* _tmp4_ = NULL;
+ PhotoBackingReaders* _tmp4_;
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8567 "Photo.c"
+#line 8591 "Photo.c"
}
#line 1042 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8571,14 +8595,14 @@ gboolean photo_is_editable_baseline (Photo* self) {
g_clear_error (&_inner_error_);
#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 8575 "Photo.c"
+#line 8599 "Photo.c"
}
}
gboolean photo_is_editable_source (Photo* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8587,7 +8611,7 @@ gboolean photo_is_editable_source (Photo* self) {
result = _tmp0_;
#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8591 "Photo.c"
+#line 8615 "Photo.c"
}
@@ -8596,18 +8620,18 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
GError * _inner_error_ = NULL;
#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8600 "Photo.c"
+#line 8624 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8607 "Photo.c"
+#line 8631 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- BackingPhotoRow* _tmp2_ = NULL;
- BackingPhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp1_;
+ BackingPhotoRow* _tmp2_;
+ BackingPhotoRow* _tmp3_;
#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8616,27 +8640,27 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
_tmp3_ = _backing_photo_row_ref0 (_tmp2_);
#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 8620 "Photo.c"
+#line 8644 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8627 "Photo.c"
+#line 8651 "Photo.c"
}
#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8631 "Photo.c"
+#line 8655 "Photo.c"
}
- __finally295:
+ __finally296:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8640 "Photo.c"
+#line 8664 "Photo.c"
}
#line 1052 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8644,7 +8668,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
g_clear_error (&_inner_error_);
#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8648 "Photo.c"
+#line 8672 "Photo.c"
}
}
@@ -8654,69 +8678,69 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
GError * _inner_error_ = NULL;
#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8658 "Photo.c"
+#line 8682 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8665 "Photo.c"
+#line 8689 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ PhotoRow* _tmp1_;
+ gboolean _tmp2_;
#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 8675 "Photo.c"
- BackingPhotoRow* _tmp3_ = NULL;
- BackingPhotoRow* _tmp4_ = NULL;
+#line 8699 "Photo.c"
+ BackingPhotoRow* _tmp3_;
+ BackingPhotoRow* _tmp4_;
#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->editable;
#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp4_;
-#line 8684 "Photo.c"
+#line 8708 "Photo.c"
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8691 "Photo.c"
+#line 8715 "Photo.c"
}
#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8695 "Photo.c"
+#line 8719 "Photo.c"
} else {
#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
result = NULL;
-#line 8699 "Photo.c"
+#line 8723 "Photo.c"
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8706 "Photo.c"
+#line 8730 "Photo.c"
}
#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8710 "Photo.c"
+#line 8734 "Photo.c"
}
}
- __finally296:
+ __finally297:
{
- PhotoRow* _tmp7_ = NULL;
+ PhotoRow* _tmp7_;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->row;
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8720 "Photo.c"
+#line 8744 "Photo.c"
}
#line 1058 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8724,7 +8748,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
g_clear_error (&_inner_error_);
#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8728 "Photo.c"
+#line 8752 "Photo.c"
}
}
@@ -8734,25 +8758,25 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
GError * _inner_error_ = NULL;
#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8738 "Photo.c"
+#line 8762 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8745 "Photo.c"
+#line 8769 "Photo.c"
{
GeeCollection* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
+ GeeHashMap* _tmp2_;
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->developments;
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 8753 "Photo.c"
- GeeHashMap* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeCollection* _tmp5_ = NULL;
+#line 8777 "Photo.c"
+ GeeHashMap* _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeCollection* _tmp5_;
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->developments;
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8763,37 +8787,37 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
_g_object_unref0 (_tmp1_);
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp5_;
-#line 8767 "Photo.c"
+#line 8791 "Photo.c"
} else {
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp1_);
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = NULL;
-#line 8773 "Photo.c"
+#line 8797 "Photo.c"
}
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
-#line 8777 "Photo.c"
+#line 8801 "Photo.c"
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8784 "Photo.c"
+#line 8808 "Photo.c"
}
#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8788 "Photo.c"
+#line 8812 "Photo.c"
}
- __finally297:
+ __finally298:
{
- PhotoRow* _tmp7_ = NULL;
+ PhotoRow* _tmp7_;
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->row;
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8797 "Photo.c"
+#line 8821 "Photo.c"
}
#line 1068 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8801,7 +8825,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
g_clear_error (&_inner_error_);
#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8805 "Photo.c"
+#line 8829 "Photo.c"
}
}
@@ -8811,25 +8835,25 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
GError * _inner_error_ = NULL;
#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8815 "Photo.c"
+#line 8839 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8822 "Photo.c"
+#line 8846 "Photo.c"
{
BackingPhotoRow* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
+ GeeHashMap* _tmp2_;
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->developments;
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 8830 "Photo.c"
- GeeHashMap* _tmp3_ = NULL;
- RawDeveloper _tmp4_ = 0;
- gpointer _tmp5_ = NULL;
+#line 8854 "Photo.c"
+ GeeHashMap* _tmp3_;
+ RawDeveloper _tmp4_;
+ gpointer _tmp5_;
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->developments;
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8840,37 +8864,37 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
_backing_photo_row_unref0 (_tmp1_);
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = (BackingPhotoRow*) _tmp5_;
-#line 8844 "Photo.c"
+#line 8868 "Photo.c"
} else {
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp1_);
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = NULL;
-#line 8850 "Photo.c"
+#line 8874 "Photo.c"
}
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
-#line 8854 "Photo.c"
+#line 8878 "Photo.c"
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8861 "Photo.c"
+#line 8885 "Photo.c"
}
#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8865 "Photo.c"
+#line 8889 "Photo.c"
}
- __finally298:
+ __finally299:
{
- PhotoRow* _tmp7_ = NULL;
+ PhotoRow* _tmp7_;
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->row;
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8874 "Photo.c"
+#line 8898 "Photo.c"
}
#line 1074 "/home/jens/Source/shotwell/src/Photo.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);
@@ -8878,7 +8902,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
g_clear_error (&_inner_error_);
#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 8882 "Photo.c"
+#line 8906 "Photo.c"
}
}
@@ -8891,25 +8915,25 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
memcpy (dup, self, sizeof (PhotoFileFormat));
#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
return dup;
-#line 8895 "Photo.c"
+#line 8919 "Photo.c"
}
static gpointer __photo_file_format_dup0 (gpointer self) {
#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? _photo_file_format_dup (self) : NULL;
-#line 8902 "Photo.c"
+#line 8926 "Photo.c"
}
PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
PhotoFileFormat* result = NULL;
PhotoFileReader* reader = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
- PhotoFileFormat* _tmp4_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoFileFormat _tmp3_;
+ PhotoFileFormat* _tmp4_;
#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8926,7 +8950,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
_photo_file_adapter_unref0 (reader);
#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8930 "Photo.c"
+#line 8954 "Photo.c"
}
#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = reader;
@@ -8940,16 +8964,16 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
_photo_file_adapter_unref0 (reader);
#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 8944 "Photo.c"
+#line 8968 "Photo.c"
}
PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params) {
PhotoFileFormat result = 0;
PhotoFileFormat _result_ = 0;
- PhotoFileFormat _tmp0_ = 0;
- ExportFormatParameters _tmp1_ = {0};
- ExportFormatMode _tmp2_ = 0;
+ PhotoFileFormat _tmp0_;
+ ExportFormatParameters _tmp1_;
+ ExportFormatMode _tmp2_;
#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8966,36 +8990,36 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
switch (_tmp2_) {
#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 8970 "Photo.c"
+#line 8994 "Photo.c"
{
- PhotoFileFormat _tmp3_ = 0;
+ PhotoFileFormat _tmp3_;
#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = photo_get_master_file_format (self);
#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
_result_ = _tmp3_;
#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 8979 "Photo.c"
+#line 9003 "Photo.c"
}
#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
case EXPORT_FORMAT_MODE_CURRENT:
-#line 8983 "Photo.c"
+#line 9007 "Photo.c"
{
- PhotoFileFormat _tmp4_ = 0;
+ PhotoFileFormat _tmp4_;
#line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_get_best_export_file_format (self);
#line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
_result_ = _tmp4_;
#line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 8992 "Photo.c"
+#line 9016 "Photo.c"
}
#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 8996 "Photo.c"
+#line 9020 "Photo.c"
{
- ExportFormatParameters _tmp5_ = {0};
- PhotoFileFormat _tmp6_ = 0;
+ ExportFormatParameters _tmp5_;
+ PhotoFileFormat _tmp6_;
#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = *params;
#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9004,30 +9028,30 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
_result_ = _tmp6_;
#line 1102 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 9008 "Photo.c"
+#line 9032 "Photo.c"
}
default:
{
#line 1105 "/home/jens/Source/shotwell/src/Photo.vala"
g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \
"format mode");
-#line 9014 "Photo.c"
+#line 9038 "Photo.c"
}
}
#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
result = _result_;
#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9021 "Photo.c"
+#line 9045 "Photo.c"
}
gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params) {
gchar* result = NULL;
gchar* _result_ = NULL;
- ExportFormatParameters _tmp0_ = {0};
- ExportFormatMode _tmp1_ = 0;
- const gchar* _tmp8_ = NULL;
+ ExportFormatParameters _tmp0_;
+ ExportFormatMode _tmp1_;
+ const gchar* _tmp8_;
#line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9042,11 +9066,11 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
switch (_tmp1_) {
#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 9045 "Photo.c"
+#line 9069 "Photo.c"
{
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
+ gchar* _tmp4_;
#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9061,17 +9085,17 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
_g_object_unref0 (_tmp3_);
#line 1117 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 9064 "Photo.c"
+#line 9088 "Photo.c"
}
#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
case EXPORT_FORMAT_MODE_CURRENT:
#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9070 "Photo.c"
+#line 9094 "Photo.c"
{
- ExportFormatParameters _tmp5_ = {0};
- PhotoFileFormat _tmp6_ = 0;
- gchar* _tmp7_ = NULL;
+ ExportFormatParameters _tmp5_;
+ PhotoFileFormat _tmp6_;
+ gchar* _tmp7_;
#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = *params;
#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9084,14 +9108,14 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
_g_free0 (_result_);
#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9087 "Photo.c"
+#line 9111 "Photo.c"
}
default:
{
#line 1124 "/home/jens/Source/shotwell/src/Photo.vala"
g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \
"t format mode");
-#line 9093 "Photo.c"
+#line 9117 "Photo.c"
}
}
#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9102,134 +9126,134 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
result = _result_;
#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9104 "Photo.c"
+#line 9128 "Photo.c"
}
ImportResult photo_prepare_for_import (PhotoImportParams* params) {
ImportResult result = 0;
GFile* file = NULL;
- PhotoImportParams* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
+ PhotoImportParams* _tmp0_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
GFileInfo* info = NULL;
- GFileInfo* _tmp7_ = NULL;
- GFileType _tmp8_ = 0;
- GFile* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- GFile* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ GFileInfo* _tmp7_;
+ GFileType _tmp8_;
+ GFile* _tmp9_;
+ gboolean _tmp10_;
+ GFile* _tmp14_;
+ gboolean _tmp15_;
GTimeVal timestamp = {0};
- GFileInfo* _tmp19_ = NULL;
+ GFileInfo* _tmp19_;
GTimeVal _tmp20_ = {0};
gboolean _tmp21_ = FALSE;
gboolean _tmp22_ = FALSE;
- PhotoImportParams* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
+ PhotoImportParams* _tmp23_;
+ const gchar* _tmp24_;
PhotoFileInterrogator* interrogator = NULL;
- GFile* _tmp32_ = NULL;
- PhotoImportParams* _tmp33_ = NULL;
- PhotoFileSnifferOptions _tmp34_ = 0;
- PhotoFileInterrogator* _tmp35_ = NULL;
- PhotoFileInterrogator* _tmp42_ = NULL;
- gboolean _tmp43_ = FALSE;
+ GFile* _tmp32_;
+ PhotoImportParams* _tmp33_;
+ PhotoFileSnifferOptions _tmp34_;
+ PhotoFileInterrogator* _tmp35_;
+ PhotoFileInterrogator* _tmp42_;
+ gboolean _tmp43_;
DetectedPhotoInformation* detected = NULL;
- PhotoFileInterrogator* _tmp44_ = NULL;
- DetectedPhotoInformation* _tmp45_ = NULL;
+ PhotoFileInterrogator* _tmp44_;
+ DetectedPhotoInformation* _tmp45_;
gboolean _tmp46_ = FALSE;
- DetectedPhotoInformation* _tmp47_ = NULL;
- PhotoImportParams* _tmp50_ = NULL;
- PhotoFileSnifferOptions _tmp51_ = 0;
+ DetectedPhotoInformation* _tmp47_;
+ PhotoImportParams* _tmp50_;
+ PhotoFileSnifferOptions _tmp51_;
Orientation orientation = 0;
time_t exposure_time = 0;
gchar* title = NULL;
- gchar* _tmp64_ = NULL;
+ gchar* _tmp64_;
gchar* comment = NULL;
- gchar* _tmp65_ = NULL;
+ gchar* _tmp65_;
Rating rating = 0;
- DetectedPhotoInformation* _tmp66_ = NULL;
- PhotoMetadata* _tmp67_ = NULL;
+ DetectedPhotoInformation* _tmp66_;
+ PhotoMetadata* _tmp67_;
gboolean _tmp90_ = FALSE;
gboolean _tmp91_ = FALSE;
- DetectedPhotoInformation* _tmp92_ = NULL;
- GdkColorspace _tmp93_ = 0;
- PhotoImportParams* _tmp101_ = NULL;
- PhotoRow* _tmp102_ = NULL;
- PhotoImportParams* _tmp103_ = NULL;
- PhotoRow* _tmp104_ = NULL;
- BackingPhotoRow* _tmp105_ = NULL;
- GFile* _tmp106_ = NULL;
- gchar* _tmp107_ = NULL;
- PhotoImportParams* _tmp108_ = NULL;
- PhotoRow* _tmp109_ = NULL;
- BackingPhotoRow* _tmp110_ = NULL;
- DetectedPhotoInformation* _tmp111_ = NULL;
- Dimensions _tmp112_ = {0};
- PhotoImportParams* _tmp113_ = NULL;
- PhotoRow* _tmp114_ = NULL;
- BackingPhotoRow* _tmp115_ = NULL;
- GFileInfo* _tmp116_ = NULL;
- gint64 _tmp117_ = 0LL;
- PhotoImportParams* _tmp118_ = NULL;
- PhotoRow* _tmp119_ = NULL;
- BackingPhotoRow* _tmp120_ = NULL;
- GTimeVal _tmp121_ = {0};
- glong _tmp122_ = 0L;
- PhotoImportParams* _tmp123_ = NULL;
- PhotoRow* _tmp124_ = NULL;
- time_t _tmp125_ = 0;
- PhotoImportParams* _tmp126_ = NULL;
- PhotoRow* _tmp127_ = NULL;
- Orientation _tmp128_ = 0;
- PhotoImportParams* _tmp129_ = NULL;
- PhotoRow* _tmp130_ = NULL;
- BackingPhotoRow* _tmp131_ = NULL;
- Orientation _tmp132_ = 0;
- PhotoImportParams* _tmp133_ = NULL;
- PhotoRow* _tmp134_ = NULL;
- PhotoImportParams* _tmp135_ = NULL;
- ImportID _tmp136_ = {0};
- PhotoImportParams* _tmp137_ = NULL;
- PhotoRow* _tmp138_ = NULL;
- PhotoImportParams* _tmp139_ = NULL;
- PhotoRow* _tmp140_ = NULL;
- PhotoImportParams* _tmp141_ = NULL;
- PhotoRow* _tmp142_ = NULL;
- DetectedPhotoInformation* _tmp143_ = NULL;
- const gchar* _tmp144_ = NULL;
- gchar* _tmp145_ = NULL;
- PhotoImportParams* _tmp146_ = NULL;
- PhotoRow* _tmp147_ = NULL;
- DetectedPhotoInformation* _tmp148_ = NULL;
- const gchar* _tmp149_ = NULL;
- gchar* _tmp150_ = NULL;
- PhotoImportParams* _tmp151_ = NULL;
- PhotoRow* _tmp152_ = NULL;
- DetectedPhotoInformation* _tmp153_ = NULL;
- const gchar* _tmp154_ = NULL;
- gchar* _tmp155_ = NULL;
- PhotoImportParams* _tmp156_ = NULL;
- PhotoRow* _tmp157_ = NULL;
- PhotoImportParams* _tmp158_ = NULL;
- PhotoRow* _tmp159_ = NULL;
- PhotoImportParams* _tmp160_ = NULL;
- PhotoRow* _tmp161_ = NULL;
- BackingPhotoRow* _tmp162_ = NULL;
- DetectedPhotoInformation* _tmp163_ = NULL;
- PhotoFileFormat _tmp164_ = 0;
- PhotoImportParams* _tmp165_ = NULL;
- PhotoRow* _tmp166_ = NULL;
- const gchar* _tmp167_ = NULL;
- gchar* _tmp168_ = NULL;
- PhotoImportParams* _tmp169_ = NULL;
- PhotoRow* _tmp170_ = NULL;
- const gchar* _tmp171_ = NULL;
- gchar* _tmp172_ = NULL;
- PhotoImportParams* _tmp173_ = NULL;
- PhotoRow* _tmp174_ = NULL;
- Rating _tmp175_ = 0;
- PhotoImportParams* _tmp176_ = NULL;
- Thumbnails* _tmp177_ = NULL;
+ DetectedPhotoInformation* _tmp92_;
+ GdkColorspace _tmp93_;
+ PhotoImportParams* _tmp101_;
+ PhotoRow* _tmp102_;
+ PhotoImportParams* _tmp103_;
+ PhotoRow* _tmp104_;
+ BackingPhotoRow* _tmp105_;
+ GFile* _tmp106_;
+ gchar* _tmp107_;
+ PhotoImportParams* _tmp108_;
+ PhotoRow* _tmp109_;
+ BackingPhotoRow* _tmp110_;
+ DetectedPhotoInformation* _tmp111_;
+ Dimensions _tmp112_;
+ PhotoImportParams* _tmp113_;
+ PhotoRow* _tmp114_;
+ BackingPhotoRow* _tmp115_;
+ GFileInfo* _tmp116_;
+ gint64 _tmp117_;
+ PhotoImportParams* _tmp118_;
+ PhotoRow* _tmp119_;
+ BackingPhotoRow* _tmp120_;
+ GTimeVal _tmp121_;
+ glong _tmp122_;
+ PhotoImportParams* _tmp123_;
+ PhotoRow* _tmp124_;
+ time_t _tmp125_;
+ PhotoImportParams* _tmp126_;
+ PhotoRow* _tmp127_;
+ Orientation _tmp128_;
+ PhotoImportParams* _tmp129_;
+ PhotoRow* _tmp130_;
+ BackingPhotoRow* _tmp131_;
+ Orientation _tmp132_;
+ PhotoImportParams* _tmp133_;
+ PhotoRow* _tmp134_;
+ PhotoImportParams* _tmp135_;
+ ImportID _tmp136_;
+ PhotoImportParams* _tmp137_;
+ PhotoRow* _tmp138_;
+ PhotoImportParams* _tmp139_;
+ PhotoRow* _tmp140_;
+ PhotoImportParams* _tmp141_;
+ PhotoRow* _tmp142_;
+ DetectedPhotoInformation* _tmp143_;
+ const gchar* _tmp144_;
+ gchar* _tmp145_;
+ PhotoImportParams* _tmp146_;
+ PhotoRow* _tmp147_;
+ DetectedPhotoInformation* _tmp148_;
+ const gchar* _tmp149_;
+ gchar* _tmp150_;
+ PhotoImportParams* _tmp151_;
+ PhotoRow* _tmp152_;
+ DetectedPhotoInformation* _tmp153_;
+ const gchar* _tmp154_;
+ gchar* _tmp155_;
+ PhotoImportParams* _tmp156_;
+ PhotoRow* _tmp157_;
+ PhotoImportParams* _tmp158_;
+ PhotoRow* _tmp159_;
+ PhotoImportParams* _tmp160_;
+ PhotoRow* _tmp161_;
+ BackingPhotoRow* _tmp162_;
+ DetectedPhotoInformation* _tmp163_;
+ PhotoFileFormat _tmp164_;
+ PhotoImportParams* _tmp165_;
+ PhotoRow* _tmp166_;
+ const gchar* _tmp167_;
+ gchar* _tmp168_;
+ PhotoImportParams* _tmp169_;
+ PhotoRow* _tmp170_;
+ const gchar* _tmp171_;
+ gchar* _tmp172_;
+ PhotoImportParams* _tmp173_;
+ PhotoRow* _tmp174_;
+ Rating _tmp175_;
+ PhotoImportParams* _tmp176_;
+ Thumbnails* _tmp177_;
GError * _inner_error_ = NULL;
#line 1143 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
@@ -9243,12 +9267,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
file = _tmp2_;
#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
info = NULL;
-#line 9245 "Photo.c"
+#line 9269 "Photo.c"
{
GFileInfo* _tmp3_ = NULL;
- GFile* _tmp4_ = NULL;
- GFileInfo* _tmp5_ = NULL;
- GFileInfo* _tmp6_ = NULL;
+ GFile* _tmp4_;
+ GFileInfo* _tmp5_;
+ GFileInfo* _tmp6_;
#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = file;
#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9257,8 +9281,8 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp3_ = _tmp5_;
#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9259 "Photo.c"
- goto __catch299_g_error;
+#line 9283 "Photo.c"
+ goto __catch300_g_error;
}
#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp3_;
@@ -9270,10 +9294,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
info = _tmp6_;
#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp3_);
-#line 9272 "Photo.c"
+#line 9296 "Photo.c"
}
- goto __finally299;
- __catch299_g_error:
+ goto __finally300;
+ __catch300_g_error:
{
GError* err = NULL;
#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9290,9 +9314,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9292 "Photo.c"
+#line 9316 "Photo.c"
}
- __finally299:
+ __finally300:
#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9305,7 +9329,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
g_clear_error (&_inner_error_);
#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 9307 "Photo.c"
+#line 9331 "Photo.c"
}
#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = info;
@@ -9321,7 +9345,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9323 "Photo.c"
+#line 9347 "Photo.c"
}
#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = file;
@@ -9329,10 +9353,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp10_ = photo_is_file_image (_tmp9_);
#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp10_) {
-#line 9331 "Photo.c"
- GFile* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+#line 9355 "Photo.c"
+ GFile* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = file;
#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9351,7 +9375,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9353 "Photo.c"
+#line 9377 "Photo.c"
}
#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = file;
@@ -9359,10 +9383,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp15_ = photo_file_format_is_file_supported (_tmp14_);
#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp15_) {
-#line 9361 "Photo.c"
- GFile* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+#line 9385 "Photo.c"
+ GFile* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = file;
#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9381,7 +9405,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9383 "Photo.c"
+#line 9407 "Photo.c"
}
#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = info;
@@ -9395,44 +9419,44 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp24_ = _tmp23_->exif_md5;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp24_ != NULL) {
-#line 9397 "Photo.c"
- PhotoImportParams* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
+#line 9421 "Photo.c"
+ PhotoImportParams* _tmp25_;
+ const gchar* _tmp26_;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = params;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = _tmp25_->thumbnail_md5;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = _tmp26_ != NULL;
-#line 9406 "Photo.c"
+#line 9430 "Photo.c"
} else {
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = FALSE;
-#line 9410 "Photo.c"
+#line 9434 "Photo.c"
}
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_) {
-#line 9414 "Photo.c"
- PhotoImportParams* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
+#line 9438 "Photo.c"
+ PhotoImportParams* _tmp27_;
+ const gchar* _tmp28_;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = params;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = _tmp27_->full_md5;
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = _tmp28_ != NULL;
-#line 9423 "Photo.c"
+#line 9447 "Photo.c"
} else {
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = FALSE;
-#line 9427 "Photo.c"
+#line 9451 "Photo.c"
}
#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_) {
-#line 9431 "Photo.c"
- PhotoImportParams* _tmp29_ = NULL;
- PhotoImportParams* _tmp30_ = NULL;
- PhotoFileSnifferOptions _tmp31_ = 0;
+#line 9455 "Photo.c"
+ PhotoImportParams* _tmp29_;
+ PhotoImportParams* _tmp30_;
+ PhotoFileSnifferOptions _tmp31_;
#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = params;
#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9441,7 +9465,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp31_ = _tmp30_->sniffer_options;
#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5;
-#line 9443 "Photo.c"
+#line 9467 "Photo.c"
}
#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = file;
@@ -9453,28 +9477,28 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_);
#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
interrogator = _tmp35_;
-#line 9455 "Photo.c"
+#line 9479 "Photo.c"
{
- PhotoFileInterrogator* _tmp36_ = NULL;
+ PhotoFileInterrogator* _tmp36_;
#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = interrogator;
#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9464 "Photo.c"
- goto __catch300_g_error;
+#line 9488 "Photo.c"
+ goto __catch301_g_error;
}
}
- goto __finally300;
- __catch300_g_error:
+ goto __finally301;
+ __catch301_g_error:
{
GError* err = NULL;
- GFile* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- GError* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
+ GFile* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ GError* _tmp40_;
+ const gchar* _tmp41_;
#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9505,9 +9529,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9507 "Photo.c"
+#line 9531 "Photo.c"
}
- __finally300:
+ __finally301:
#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9522,7 +9546,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
g_clear_error (&_inner_error_);
#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 9524 "Photo.c"
+#line 9548 "Photo.c"
}
#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = interrogator;
@@ -9540,7 +9564,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9542 "Photo.c"
+#line 9566 "Photo.c"
}
#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp44_ = interrogator;
@@ -9554,17 +9578,17 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
if (_tmp47_ == NULL) {
#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = TRUE;
-#line 9556 "Photo.c"
+#line 9580 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp48_ = NULL;
- PhotoFileFormat _tmp49_ = 0;
+ DetectedPhotoInformation* _tmp48_;
+ PhotoFileFormat _tmp49_;
#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp48_ = detected;
#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = _tmp48_->file_format;
#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9566 "Photo.c"
+#line 9590 "Photo.c"
}
#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp46_) {
@@ -9580,7 +9604,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9582 "Photo.c"
+#line 9606 "Photo.c"
}
#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = params;
@@ -9588,19 +9612,19 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp51_ = _tmp50_->sniffer_options;
#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) {
-#line 9590 "Photo.c"
- DetectedPhotoInformation* _tmp52_ = NULL;
- PhotoImportParams* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
- DetectedPhotoInformation* _tmp56_ = NULL;
- PhotoImportParams* _tmp57_ = NULL;
- const gchar* _tmp58_ = NULL;
- gchar* _tmp59_ = NULL;
- DetectedPhotoInformation* _tmp60_ = NULL;
- PhotoImportParams* _tmp61_ = NULL;
- const gchar* _tmp62_ = NULL;
- gchar* _tmp63_ = NULL;
+#line 9614 "Photo.c"
+ DetectedPhotoInformation* _tmp52_;
+ PhotoImportParams* _tmp53_;
+ const gchar* _tmp54_;
+ gchar* _tmp55_;
+ DetectedPhotoInformation* _tmp56_;
+ PhotoImportParams* _tmp57_;
+ const gchar* _tmp58_;
+ gchar* _tmp59_;
+ DetectedPhotoInformation* _tmp60_;
+ PhotoImportParams* _tmp61_;
+ const gchar* _tmp62_;
+ gchar* _tmp63_;
#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = detected;
#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9637,7 +9661,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_free0 (_tmp60_->md5);
#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp60_->md5 = _tmp63_;
-#line 9639 "Photo.c"
+#line 9663 "Photo.c"
}
#line 1203 "/home/jens/Source/shotwell/src/Photo.vala"
orientation = ORIENTATION_TOP_LEFT;
@@ -9659,28 +9683,28 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp67_ = _tmp66_->metadata;
#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp67_ != NULL) {
-#line 9661 "Photo.c"
+#line 9685 "Photo.c"
MetadataDateTime* date_time = NULL;
- DetectedPhotoInformation* _tmp68_ = NULL;
- PhotoMetadata* _tmp69_ = NULL;
- MetadataDateTime* _tmp70_ = NULL;
- MetadataDateTime* _tmp71_ = NULL;
- DetectedPhotoInformation* _tmp74_ = NULL;
- PhotoMetadata* _tmp75_ = NULL;
- Orientation _tmp76_ = 0;
- DetectedPhotoInformation* _tmp77_ = NULL;
- PhotoMetadata* _tmp78_ = NULL;
- gchar* _tmp79_ = NULL;
- DetectedPhotoInformation* _tmp80_ = NULL;
- PhotoMetadata* _tmp81_ = NULL;
- gchar* _tmp82_ = NULL;
- PhotoImportParams* _tmp83_ = NULL;
- DetectedPhotoInformation* _tmp84_ = NULL;
- PhotoMetadata* _tmp85_ = NULL;
- GeeSet* _tmp86_ = NULL;
- DetectedPhotoInformation* _tmp87_ = NULL;
- PhotoMetadata* _tmp88_ = NULL;
- Rating _tmp89_ = 0;
+ DetectedPhotoInformation* _tmp68_;
+ PhotoMetadata* _tmp69_;
+ MetadataDateTime* _tmp70_;
+ MetadataDateTime* _tmp71_;
+ DetectedPhotoInformation* _tmp74_;
+ PhotoMetadata* _tmp75_;
+ Orientation _tmp76_;
+ DetectedPhotoInformation* _tmp77_;
+ PhotoMetadata* _tmp78_;
+ gchar* _tmp79_;
+ DetectedPhotoInformation* _tmp80_;
+ PhotoMetadata* _tmp81_;
+ gchar* _tmp82_;
+ PhotoImportParams* _tmp83_;
+ DetectedPhotoInformation* _tmp84_;
+ PhotoMetadata* _tmp85_;
+ GeeSet* _tmp86_;
+ DetectedPhotoInformation* _tmp87_;
+ PhotoMetadata* _tmp88_;
+ Rating _tmp89_;
#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp68_ = detected;
#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9693,16 +9717,16 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp71_ = date_time;
#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp71_ != NULL) {
-#line 9695 "Photo.c"
- MetadataDateTime* _tmp72_ = NULL;
- time_t _tmp73_ = 0;
+#line 9719 "Photo.c"
+ MetadataDateTime* _tmp72_;
+ time_t _tmp73_;
#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp72_ = date_time;
#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
exposure_time = _tmp73_;
-#line 9704 "Photo.c"
+#line 9728 "Photo.c"
}
#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp74_ = detected;
@@ -9754,7 +9778,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
rating = _tmp89_;
#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (date_time);
-#line 9756 "Photo.c"
+#line 9780 "Photo.c"
}
#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp92_ = detected;
@@ -9764,40 +9788,40 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
if (_tmp93_ != GDK_COLORSPACE_RGB) {
#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp91_ = TRUE;
-#line 9766 "Photo.c"
+#line 9790 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp94_ = NULL;
- gint _tmp95_ = 0;
+ DetectedPhotoInformation* _tmp94_;
+ gint _tmp95_;
#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp94_ = detected;
#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp95_ = _tmp94_->channels;
#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp91_ = _tmp95_ < 3;
-#line 9776 "Photo.c"
+#line 9800 "Photo.c"
}
#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp91_) {
#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp90_ = TRUE;
-#line 9782 "Photo.c"
+#line 9806 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp96_ = NULL;
- gint _tmp97_ = 0;
+ DetectedPhotoInformation* _tmp96_;
+ gint _tmp97_;
#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp96_ = detected;
#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp97_ = _tmp96_->bits_per_channel;
#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp90_ = _tmp97_ != 8;
-#line 9792 "Photo.c"
+#line 9816 "Photo.c"
}
#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp90_) {
-#line 9796 "Photo.c"
- GFile* _tmp98_ = NULL;
- gchar* _tmp99_ = NULL;
- gchar* _tmp100_ = NULL;
+#line 9820 "Photo.c"
+ GFile* _tmp98_;
+ gchar* _tmp99_;
+ gchar* _tmp100_;
#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp98_ = file;
#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9824,7 +9848,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 9826 "Photo.c"
+#line 9850 "Photo.c"
}
#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp101_ = params;
@@ -10036,18 +10060,18 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp177_ = _tmp176_->thumbnails;
#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp177_ != NULL) {
-#line 10038 "Photo.c"
+#line 10062 "Photo.c"
PhotoFileReader* reader = NULL;
- PhotoImportParams* _tmp178_ = NULL;
- PhotoRow* _tmp179_ = NULL;
- BackingPhotoRow* _tmp180_ = NULL;
- PhotoFileFormat _tmp181_ = 0;
- PhotoImportParams* _tmp182_ = NULL;
- PhotoRow* _tmp183_ = NULL;
- BackingPhotoRow* _tmp184_ = NULL;
- const gchar* _tmp185_ = NULL;
- PhotoFileReader* _tmp186_ = NULL;
- PhotoFileReader* _tmp187_ = NULL;
+ PhotoImportParams* _tmp178_;
+ PhotoRow* _tmp179_;
+ BackingPhotoRow* _tmp180_;
+ PhotoFileFormat _tmp181_;
+ PhotoImportParams* _tmp182_;
+ PhotoRow* _tmp183_;
+ BackingPhotoRow* _tmp184_;
+ const gchar* _tmp185_;
+ PhotoFileReader* _tmp186_;
+ PhotoFileReader* _tmp187_;
#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp178_ = params;
#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10072,18 +10096,18 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_tmp187_ = reader;
#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL);
-#line 10074 "Photo.c"
- {
- PhotoImportParams* _tmp188_ = NULL;
- Thumbnails* _tmp189_ = NULL;
- PhotoFileReader* _tmp190_ = NULL;
- PhotoImportParams* _tmp191_ = NULL;
- PhotoRow* _tmp192_ = NULL;
- Orientation _tmp193_ = 0;
- PhotoImportParams* _tmp194_ = NULL;
- PhotoRow* _tmp195_ = NULL;
- BackingPhotoRow* _tmp196_ = NULL;
- Dimensions _tmp197_ = {0};
+#line 10098 "Photo.c"
+ {
+ PhotoImportParams* _tmp188_;
+ Thumbnails* _tmp189_;
+ PhotoFileReader* _tmp190_;
+ PhotoImportParams* _tmp191_;
+ PhotoRow* _tmp192_;
+ Orientation _tmp193_;
+ PhotoImportParams* _tmp194_;
+ PhotoRow* _tmp195_;
+ BackingPhotoRow* _tmp196_;
+ Dimensions _tmp197_;
#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp188_ = params;
#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10108,16 +10132,16 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_);
#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10110 "Photo.c"
- goto __catch301_g_error;
+#line 10134 "Photo.c"
+ goto __catch302_g_error;
}
}
- goto __finally301;
- __catch301_g_error:
+ goto __finally302;
+ __catch302_g_error:
{
GError* err = NULL;
- GError* _tmp198_ = NULL;
- ImportResult _tmp199_ = 0;
+ GError* _tmp198_;
+ ImportResult _tmp199_;
#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10146,9 +10170,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 10148 "Photo.c"
+#line 10172 "Photo.c"
}
- __finally301:
+ __finally302:
#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10171,11 +10195,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
g_clear_error (&_inner_error_);
#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 10173 "Photo.c"
+#line 10197 "Photo.c"
}
#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (reader);
-#line 10177 "Photo.c"
+#line 10201 "Photo.c"
}
#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
result = IMPORT_RESULT_SUCCESS;
@@ -10193,70 +10217,70 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
_g_object_unref0 (file);
#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 10195 "Photo.c"
+#line 10219 "Photo.c"
}
void photo_create_pre_import (PhotoImportParams* params) {
GFile* file = NULL;
- PhotoImportParams* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- PhotoImportParams* _tmp3_ = NULL;
- PhotoRow* _tmp4_ = NULL;
- PhotoImportParams* _tmp5_ = NULL;
- PhotoRow* _tmp6_ = NULL;
- BackingPhotoRow* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- PhotoImportParams* _tmp9_ = NULL;
- PhotoRow* _tmp10_ = NULL;
- BackingPhotoRow* _tmp11_ = NULL;
- PhotoImportParams* _tmp12_ = NULL;
- PhotoRow* _tmp13_ = NULL;
- BackingPhotoRow* _tmp14_ = NULL;
- PhotoImportParams* _tmp15_ = NULL;
- PhotoRow* _tmp16_ = NULL;
- BackingPhotoRow* _tmp17_ = NULL;
- PhotoImportParams* _tmp18_ = NULL;
- PhotoRow* _tmp19_ = NULL;
- PhotoImportParams* _tmp20_ = NULL;
- PhotoRow* _tmp21_ = NULL;
- PhotoImportParams* _tmp22_ = NULL;
- PhotoRow* _tmp23_ = NULL;
- BackingPhotoRow* _tmp24_ = NULL;
- PhotoImportParams* _tmp25_ = NULL;
- PhotoRow* _tmp26_ = NULL;
- PhotoImportParams* _tmp27_ = NULL;
- ImportID _tmp28_ = {0};
- PhotoImportParams* _tmp29_ = NULL;
- PhotoRow* _tmp30_ = NULL;
- PhotoImportParams* _tmp31_ = NULL;
- PhotoRow* _tmp32_ = NULL;
- PhotoImportParams* _tmp33_ = NULL;
- PhotoRow* _tmp34_ = NULL;
- PhotoImportParams* _tmp35_ = NULL;
- PhotoRow* _tmp36_ = NULL;
- PhotoImportParams* _tmp37_ = NULL;
- PhotoRow* _tmp38_ = NULL;
- PhotoImportParams* _tmp39_ = NULL;
- PhotoRow* _tmp40_ = NULL;
- PhotoImportParams* _tmp41_ = NULL;
- PhotoRow* _tmp42_ = NULL;
- PhotoImportParams* _tmp43_ = NULL;
- PhotoRow* _tmp44_ = NULL;
- BackingPhotoRow* _tmp45_ = NULL;
- PhotoImportParams* _tmp46_ = NULL;
- PhotoRow* _tmp47_ = NULL;
- PhotoImportParams* _tmp48_ = NULL;
- PhotoRow* _tmp49_ = NULL;
- PhotoImportParams* _tmp50_ = NULL;
- PhotoRow* _tmp51_ = NULL;
+ PhotoImportParams* _tmp0_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ PhotoImportParams* _tmp3_;
+ PhotoRow* _tmp4_;
+ PhotoImportParams* _tmp5_;
+ PhotoRow* _tmp6_;
+ BackingPhotoRow* _tmp7_;
+ gchar* _tmp8_;
+ PhotoImportParams* _tmp9_;
+ PhotoRow* _tmp10_;
+ BackingPhotoRow* _tmp11_;
+ PhotoImportParams* _tmp12_;
+ PhotoRow* _tmp13_;
+ BackingPhotoRow* _tmp14_;
+ PhotoImportParams* _tmp15_;
+ PhotoRow* _tmp16_;
+ BackingPhotoRow* _tmp17_;
+ PhotoImportParams* _tmp18_;
+ PhotoRow* _tmp19_;
+ PhotoImportParams* _tmp20_;
+ PhotoRow* _tmp21_;
+ PhotoImportParams* _tmp22_;
+ PhotoRow* _tmp23_;
+ BackingPhotoRow* _tmp24_;
+ PhotoImportParams* _tmp25_;
+ PhotoRow* _tmp26_;
+ PhotoImportParams* _tmp27_;
+ ImportID _tmp28_;
+ PhotoImportParams* _tmp29_;
+ PhotoRow* _tmp30_;
+ PhotoImportParams* _tmp31_;
+ PhotoRow* _tmp32_;
+ PhotoImportParams* _tmp33_;
+ PhotoRow* _tmp34_;
+ PhotoImportParams* _tmp35_;
+ PhotoRow* _tmp36_;
+ PhotoImportParams* _tmp37_;
+ PhotoRow* _tmp38_;
+ PhotoImportParams* _tmp39_;
+ PhotoRow* _tmp40_;
+ PhotoImportParams* _tmp41_;
+ PhotoRow* _tmp42_;
+ PhotoImportParams* _tmp43_;
+ PhotoRow* _tmp44_;
+ BackingPhotoRow* _tmp45_;
+ PhotoImportParams* _tmp46_;
+ PhotoRow* _tmp47_;
+ PhotoImportParams* _tmp48_;
+ PhotoRow* _tmp49_;
+ PhotoImportParams* _tmp50_;
+ PhotoRow* _tmp51_;
PhotoFileInterrogator* interrogator = NULL;
- PhotoImportParams* _tmp52_ = NULL;
- GFile* _tmp53_ = NULL;
- PhotoImportParams* _tmp54_ = NULL;
- PhotoFileSnifferOptions _tmp55_ = 0;
- PhotoFileInterrogator* _tmp56_ = NULL;
+ PhotoImportParams* _tmp52_;
+ GFile* _tmp53_;
+ PhotoImportParams* _tmp54_;
+ PhotoFileSnifferOptions _tmp55_;
+ PhotoFileInterrogator* _tmp56_;
GError * _inner_error_ = NULL;
#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params));
@@ -10432,19 +10456,19 @@ void photo_create_pre_import (PhotoImportParams* params) {
_tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_);
#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
interrogator = _tmp56_;
-#line 10434 "Photo.c"
+#line 10458 "Photo.c"
{
DetectedPhotoInformation* detected = NULL;
- DetectedPhotoInformation* _tmp57_ = NULL;
+ DetectedPhotoInformation* _tmp57_;
gboolean _tmp58_ = FALSE;
gboolean _tmp59_ = FALSE;
- DetectedPhotoInformation* _tmp60_ = NULL;
+ DetectedPhotoInformation* _tmp60_;
#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
photo_file_interrogator_interrogate (interrogator, &_inner_error_);
#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10445 "Photo.c"
- goto __catch302_g_error;
+#line 10469 "Photo.c"
+ goto __catch303_g_error;
}
#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -10454,43 +10478,43 @@ void photo_create_pre_import (PhotoImportParams* params) {
_tmp60_ = detected;
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp60_ != NULL) {
-#line 10456 "Photo.c"
- gboolean _tmp61_ = FALSE;
+#line 10480 "Photo.c"
+ gboolean _tmp61_;
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = !_tmp61_;
-#line 10462 "Photo.c"
+#line 10486 "Photo.c"
} else {
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = FALSE;
-#line 10466 "Photo.c"
+#line 10490 "Photo.c"
}
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp59_) {
-#line 10470 "Photo.c"
- DetectedPhotoInformation* _tmp62_ = NULL;
- PhotoFileFormat _tmp63_ = 0;
+#line 10494 "Photo.c"
+ DetectedPhotoInformation* _tmp62_;
+ PhotoFileFormat _tmp63_;
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp62_ = detected;
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp63_ = _tmp62_->file_format;
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10479 "Photo.c"
+#line 10503 "Photo.c"
} else {
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = FALSE;
-#line 10483 "Photo.c"
+#line 10507 "Photo.c"
}
#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp58_) {
-#line 10487 "Photo.c"
- PhotoImportParams* _tmp64_ = NULL;
- PhotoRow* _tmp65_ = NULL;
- BackingPhotoRow* _tmp66_ = NULL;
- DetectedPhotoInformation* _tmp67_ = NULL;
- PhotoFileFormat _tmp68_ = 0;
+#line 10511 "Photo.c"
+ PhotoImportParams* _tmp64_;
+ PhotoRow* _tmp65_;
+ BackingPhotoRow* _tmp66_;
+ DetectedPhotoInformation* _tmp67_;
+ PhotoFileFormat _tmp68_;
#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp64_ = params;
#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10503,20 +10527,20 @@ void photo_create_pre_import (PhotoImportParams* params) {
_tmp68_ = _tmp67_->file_format;
#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp66_->file_format = _tmp68_;
-#line 10505 "Photo.c"
+#line 10529 "Photo.c"
}
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (detected);
-#line 10509 "Photo.c"
+#line 10533 "Photo.c"
}
- goto __finally302;
- __catch302_g_error:
+ goto __finally303;
+ __catch303_g_error:
{
GError* err = NULL;
- gchar* _tmp69_ = NULL;
- gchar* _tmp70_ = NULL;
- GError* _tmp71_ = NULL;
- const gchar* _tmp72_ = NULL;
+ gchar* _tmp69_;
+ gchar* _tmp70_;
+ GError* _tmp71_;
+ const gchar* _tmp72_;
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10535,9 +10559,9 @@ void photo_create_pre_import (PhotoImportParams* params) {
_g_free0 (_tmp70_);
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 10537 "Photo.c"
+#line 10561 "Photo.c"
}
- __finally302:
+ __finally303:
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10550,53 +10574,53 @@ void photo_create_pre_import (PhotoImportParams* params) {
g_clear_error (&_inner_error_);
#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 10552 "Photo.c"
+#line 10576 "Photo.c"
}
#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_interrogator_unref0 (interrogator);
#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (file);
-#line 10558 "Photo.c"
+#line 10582 "Photo.c"
}
-BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation** detected, GError** error) {
+BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoFileSnifferOptions options, DetectedPhotoInformation* * detected, GError** error) {
DetectedPhotoInformation* _vala_detected = NULL;
BackingPhotoRow* result = NULL;
BackingPhotoRow* backing = NULL;
- BackingPhotoRow* _tmp0_ = NULL;
+ BackingPhotoRow* _tmp0_;
GFileInfo* info = NULL;
PhotoFileInterrogator* interrogator = NULL;
- GFile* _tmp10_ = NULL;
- PhotoFileSnifferOptions _tmp11_ = 0;
- PhotoFileInterrogator* _tmp12_ = NULL;
- PhotoFileInterrogator* _tmp13_ = NULL;
- PhotoFileInterrogator* _tmp14_ = NULL;
- DetectedPhotoInformation* _tmp15_ = NULL;
+ GFile* _tmp10_;
+ PhotoFileSnifferOptions _tmp11_;
+ PhotoFileInterrogator* _tmp12_;
+ PhotoFileInterrogator* _tmp13_;
+ PhotoFileInterrogator* _tmp14_;
+ DetectedPhotoInformation* _tmp15_;
gboolean _tmp16_ = FALSE;
- DetectedPhotoInformation* _tmp17_ = NULL;
+ DetectedPhotoInformation* _tmp17_;
GTimeVal modification_time = {0};
- GFileInfo* _tmp22_ = NULL;
+ GFileInfo* _tmp22_;
GTimeVal _tmp23_ = {0};
- BackingPhotoRow* _tmp24_ = NULL;
- GFile* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- BackingPhotoRow* _tmp27_ = NULL;
- GTimeVal _tmp28_ = {0};
- glong _tmp29_ = 0L;
- BackingPhotoRow* _tmp30_ = NULL;
- GFileInfo* _tmp31_ = NULL;
- gint64 _tmp32_ = 0LL;
- BackingPhotoRow* _tmp33_ = NULL;
- DetectedPhotoInformation* _tmp34_ = NULL;
- PhotoFileFormat _tmp35_ = 0;
- BackingPhotoRow* _tmp36_ = NULL;
- DetectedPhotoInformation* _tmp37_ = NULL;
- Dimensions _tmp38_ = {0};
+ BackingPhotoRow* _tmp24_;
+ GFile* _tmp25_;
+ gchar* _tmp26_;
+ BackingPhotoRow* _tmp27_;
+ GTimeVal _tmp28_;
+ glong _tmp29_;
+ BackingPhotoRow* _tmp30_;
+ GFileInfo* _tmp31_;
+ gint64 _tmp32_;
+ BackingPhotoRow* _tmp33_;
+ DetectedPhotoInformation* _tmp34_;
+ PhotoFileFormat _tmp35_;
+ BackingPhotoRow* _tmp36_;
+ DetectedPhotoInformation* _tmp37_;
+ Dimensions _tmp38_;
Orientation _tmp39_ = 0;
- DetectedPhotoInformation* _tmp40_ = NULL;
- PhotoMetadata* _tmp41_ = NULL;
- BackingPhotoRow* _tmp45_ = NULL;
+ DetectedPhotoInformation* _tmp40_;
+ PhotoMetadata* _tmp41_;
+ BackingPhotoRow* _tmp45_;
GError * _inner_error_ = NULL;
#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -10612,12 +10636,12 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
backing = _tmp0_;
#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
info = NULL;
-#line 10614 "Photo.c"
+#line 10638 "Photo.c"
{
GFileInfo* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFileInfo* _tmp3_ = NULL;
- GFileInfo* _tmp4_ = NULL;
+ GFile* _tmp2_;
+ GFileInfo* _tmp3_;
+ GFileInfo* _tmp4_;
#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = file;
#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10626,8 +10650,8 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
_tmp1_ = _tmp3_;
#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10628 "Photo.c"
- goto __catch303_g_error;
+#line 10652 "Photo.c"
+ goto __catch304_g_error;
}
#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp1_;
@@ -10639,17 +10663,17 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
info = _tmp4_;
#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp1_);
-#line 10641 "Photo.c"
+#line 10665 "Photo.c"
}
- goto __finally303;
- __catch303_g_error:
+ goto __finally304;
+ __catch304_g_error:
{
GError* err = NULL;
- GFile* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+ GFile* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GError* _tmp8_;
+ const gchar* _tmp9_;
#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10680,17 +10704,17 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
if (detected) {
#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
*detected = _vala_detected;
-#line 10682 "Photo.c"
+#line 10706 "Photo.c"
} else {
#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (_vala_detected);
-#line 10686 "Photo.c"
+#line 10710 "Photo.c"
}
#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 10690 "Photo.c"
+#line 10714 "Photo.c"
}
- __finally303:
+ __finally304:
#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10701,7 +10725,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
_backing_photo_row_unref0 (backing);
#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 10703 "Photo.c"
+#line 10727 "Photo.c"
}
#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = file;
@@ -10727,7 +10751,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
_backing_photo_row_unref0 (backing);
#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 10729 "Photo.c"
+#line 10753 "Photo.c"
}
#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = interrogator;
@@ -10743,23 +10767,23 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
if (_tmp17_ == NULL) {
#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = TRUE;
-#line 10745 "Photo.c"
+#line 10769 "Photo.c"
} else {
- PhotoFileInterrogator* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ PhotoFileInterrogator* _tmp18_;
+ gboolean _tmp19_;
#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = interrogator;
#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = _tmp19_;
-#line 10755 "Photo.c"
+#line 10779 "Photo.c"
}
#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp16_) {
-#line 10759 "Photo.c"
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
+#line 10783 "Photo.c"
+ gchar* _tmp20_;
+ gchar* _tmp21_;
#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10780,15 +10804,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
if (detected) {
#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
*detected = _vala_detected;
-#line 10782 "Photo.c"
+#line 10806 "Photo.c"
} else {
#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (_vala_detected);
-#line 10786 "Photo.c"
+#line 10810 "Photo.c"
}
#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 10790 "Photo.c"
+#line 10814 "Photo.c"
}
#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = info;
@@ -10844,10 +10868,10 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
_tmp41_ = _tmp40_->metadata;
#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp41_ != NULL) {
-#line 10846 "Photo.c"
- DetectedPhotoInformation* _tmp42_ = NULL;
- PhotoMetadata* _tmp43_ = NULL;
- Orientation _tmp44_ = 0;
+#line 10870 "Photo.c"
+ DetectedPhotoInformation* _tmp42_;
+ PhotoMetadata* _tmp43_;
+ Orientation _tmp44_;
#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = _vala_detected;
#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10856,11 +10880,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
_tmp44_ = photo_metadata_get_orientation (_tmp43_);
#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = _tmp44_;
-#line 10858 "Photo.c"
+#line 10882 "Photo.c"
} else {
#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10862 "Photo.c"
+#line 10886 "Photo.c"
}
#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = backing;
@@ -10876,185 +10900,185 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
if (detected) {
#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
*detected = _vala_detected;
-#line 10878 "Photo.c"
+#line 10902 "Photo.c"
} else {
#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (_vala_detected);
-#line 10882 "Photo.c"
+#line 10906 "Photo.c"
}
#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 10886 "Photo.c"
+#line 10910 "Photo.c"
}
-static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value) {
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10897 "Photo.c"
+#line 10921 "Photo.c"
}
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 10903 "Photo.c"
+#line 10927 "Photo.c"
}
-static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value) {
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10914 "Photo.c"
+#line 10938 "Photo.c"
}
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 10920 "Photo.c"
+#line 10944 "Photo.c"
}
-static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value) {
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10931 "Photo.c"
+#line 10955 "Photo.c"
}
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 10937 "Photo.c"
+#line 10961 "Photo.c"
}
-static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value) {
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10948 "Photo.c"
+#line 10972 "Photo.c"
}
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 10954 "Photo.c"
+#line 10978 "Photo.c"
}
-static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) {
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10965 "Photo.c"
+#line 10989 "Photo.c"
}
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 10971 "Photo.c"
+#line 10995 "Photo.c"
}
-static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) {
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10982 "Photo.c"
+#line 11006 "Photo.c"
}
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 10988 "Photo.c"
+#line 11012 "Photo.c"
}
static gpointer _media_metadata_ref0 (gpointer self) {
#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? media_metadata_ref (self) : NULL;
-#line 10995 "Photo.c"
+#line 11019 "Photo.c"
}
-gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error) {
+gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error) {
PhotoReimportMasterState* _vala_reimport_state = NULL;
gboolean result = FALSE;
GFile* file = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
DetectedPhotoInformation* detected = NULL;
BackingPhotoRow* backing = NULL;
- GFile* _tmp4_ = NULL;
+ GFile* _tmp4_;
DetectedPhotoInformation* _tmp5_ = NULL;
- BackingPhotoRow* _tmp6_ = NULL;
- BackingPhotoRow* _tmp8_ = NULL;
+ BackingPhotoRow* _tmp6_;
+ BackingPhotoRow* _tmp8_;
gboolean _tmp12_ = FALSE;
gboolean _tmp13_ = FALSE;
- DetectedPhotoInformation* _tmp14_ = NULL;
- GdkColorspace _tmp15_ = 0;
+ DetectedPhotoInformation* _tmp14_;
+ GdkColorspace _tmp15_;
PhotoRow* updated_row = NULL;
- PhotoRow* _tmp23_ = NULL;
+ PhotoRow* _tmp23_;
gchar** list = NULL;
- gchar** _tmp29_ = NULL;
- gint list_length1 = 0;
- gint _list_size_ = 0;
- PhotoRow* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- DetectedPhotoInformation* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- PhotoRow* _tmp36_ = NULL;
- BackingPhotoRow* _tmp37_ = NULL;
- Orientation _tmp38_ = 0;
- BackingPhotoRow* _tmp39_ = NULL;
- Orientation _tmp40_ = 0;
- DetectedPhotoInformation* _tmp47_ = NULL;
- PhotoMetadata* _tmp48_ = NULL;
- PhotoRow* _tmp85_ = NULL;
- BackingPhotoRow* _tmp86_ = NULL;
- BackingPhotoRow* _tmp87_ = NULL;
- PhotoRow* _tmp88_ = NULL;
- DetectedPhotoInformation* _tmp89_ = NULL;
- const gchar* _tmp90_ = NULL;
- gchar* _tmp91_ = NULL;
- PhotoRow* _tmp92_ = NULL;
- DetectedPhotoInformation* _tmp93_ = NULL;
- const gchar* _tmp94_ = NULL;
- gchar* _tmp95_ = NULL;
- PhotoRow* _tmp96_ = NULL;
- DetectedPhotoInformation* _tmp97_ = NULL;
- const gchar* _tmp98_ = NULL;
- gchar* _tmp99_ = NULL;
+ gchar** _tmp29_;
+ gint list_length1;
+ gint _list_size_;
+ PhotoRow* _tmp30_;
+ const gchar* _tmp31_;
+ DetectedPhotoInformation* _tmp32_;
+ const gchar* _tmp33_;
+ PhotoRow* _tmp36_;
+ BackingPhotoRow* _tmp37_;
+ Orientation _tmp38_;
+ BackingPhotoRow* _tmp39_;
+ Orientation _tmp40_;
+ DetectedPhotoInformation* _tmp47_;
+ PhotoMetadata* _tmp48_;
+ PhotoRow* _tmp85_;
+ BackingPhotoRow* _tmp86_;
+ BackingPhotoRow* _tmp87_;
+ PhotoRow* _tmp88_;
+ DetectedPhotoInformation* _tmp89_;
+ const gchar* _tmp90_;
+ gchar* _tmp91_;
+ PhotoRow* _tmp92_;
+ DetectedPhotoInformation* _tmp93_;
+ const gchar* _tmp94_;
+ gchar* _tmp95_;
+ PhotoRow* _tmp96_;
+ DetectedPhotoInformation* _tmp97_;
+ const gchar* _tmp98_;
+ gchar* _tmp99_;
PhotoMetadata* metadata = NULL;
- DetectedPhotoInformation* _tmp100_ = NULL;
- PhotoMetadata* _tmp101_ = NULL;
- PhotoRow* _tmp124_ = NULL;
- PhotoMetadata* _tmp125_ = NULL;
- gchar** _tmp126_ = NULL;
- gint _tmp126__length1 = 0;
- PhotoReimportMasterStateImpl* _tmp127_ = NULL;
+ DetectedPhotoInformation* _tmp100_;
+ PhotoMetadata* _tmp101_;
+ PhotoRow* _tmp124_;
+ PhotoMetadata* _tmp125_;
+ gchar** _tmp126_;
+ gint _tmp126__length1;
+ PhotoReimportMasterStateImpl* _tmp127_;
GError * _inner_error_ = NULL;
#line 1411 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -11086,7 +11110,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
backing = _tmp6_;
#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11088 "Photo.c"
+#line 11112 "Photo.c"
gboolean _tmp7_ = FALSE;
#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -11096,16 +11120,16 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_g_object_unref0 (file);
#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp7_;
-#line 11098 "Photo.c"
+#line 11122 "Photo.c"
}
#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = backing;
#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ == NULL) {
-#line 11104 "Photo.c"
- GFile* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
+#line 11128 "Photo.c"
+ GFile* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = file;
#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11128,15 +11152,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
if (reimport_state) {
#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
*reimport_state = _vala_reimport_state;
-#line 11130 "Photo.c"
+#line 11154 "Photo.c"
} else {
#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11134 "Photo.c"
+#line 11158 "Photo.c"
}
#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 11138 "Photo.c"
+#line 11162 "Photo.c"
}
#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = detected;
@@ -11146,40 +11170,40 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
if (_tmp15_ != GDK_COLORSPACE_RGB) {
#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = TRUE;
-#line 11148 "Photo.c"
+#line 11172 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp16_ = NULL;
- gint _tmp17_ = 0;
+ DetectedPhotoInformation* _tmp16_;
+ gint _tmp17_;
#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = detected;
#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = _tmp16_->channels;
#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _tmp17_ < 3;
-#line 11158 "Photo.c"
+#line 11182 "Photo.c"
}
#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = TRUE;
-#line 11164 "Photo.c"
+#line 11188 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp18_ = NULL;
- gint _tmp19_ = 0;
+ DetectedPhotoInformation* _tmp18_;
+ gint _tmp19_;
#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = detected;
#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = _tmp18_->bits_per_channel;
#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _tmp19_ != 8;
-#line 11174 "Photo.c"
+#line 11198 "Photo.c"
}
#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 11178 "Photo.c"
- GFile* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
+#line 11202 "Photo.c"
+ GFile* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = file;
#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11202,31 +11226,31 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
if (reimport_state) {
#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
*reimport_state = _vala_reimport_state;
-#line 11204 "Photo.c"
+#line 11228 "Photo.c"
} else {
#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11208 "Photo.c"
+#line 11232 "Photo.c"
}
#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 11212 "Photo.c"
+#line 11236 "Photo.c"
}
#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = photo_row_new ();
#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
updated_row = _tmp23_;
-#line 11218 "Photo.c"
+#line 11242 "Photo.c"
{
- PhotoRow* _tmp24_ = NULL;
+ PhotoRow* _tmp24_;
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = self->row;
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11225 "Photo.c"
+#line 11249 "Photo.c"
{
- PhotoRow* _tmp25_ = NULL;
- PhotoRow* _tmp26_ = NULL;
+ PhotoRow* _tmp25_;
+ PhotoRow* _tmp26_;
#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = self->row;
#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11235,20 +11259,20 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_photo_row_unref0 (updated_row);
#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
updated_row = _tmp26_;
-#line 11237 "Photo.c"
+#line 11261 "Photo.c"
}
- __finally304:
+ __finally305:
{
- PhotoRow* _tmp27_ = NULL;
+ PhotoRow* _tmp27_;
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = self->row;
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11246 "Photo.c"
+#line 11270 "Photo.c"
}
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11250 "Photo.c"
+#line 11274 "Photo.c"
gboolean _tmp28_ = FALSE;
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -11262,7 +11286,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_g_object_unref0 (file);
#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp28_;
-#line 11264 "Photo.c"
+#line 11288 "Photo.c"
}
}
#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11283,10 +11307,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp33_ = _tmp32_->md5;
#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_strcmp0 (_tmp31_, _tmp33_) != 0) {
-#line 11285 "Photo.c"
- gchar** _tmp34_ = NULL;
- gint _tmp34__length1 = 0;
- gchar* _tmp35_ = NULL;
+#line 11309 "Photo.c"
+ gchar** _tmp34_;
+ gint _tmp34__length1;
+ gchar* _tmp35_;
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = list;
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11295,7 +11319,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp35_ = g_strdup ("metadata:md5");
#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp35_);
-#line 11297 "Photo.c"
+#line 11321 "Photo.c"
}
#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = updated_row;
@@ -11309,14 +11333,14 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp40_ = _tmp39_->original_orientation;
#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp38_ != _tmp40_) {
-#line 11311 "Photo.c"
- gchar** _tmp41_ = NULL;
- gint _tmp41__length1 = 0;
- gchar* _tmp42_ = NULL;
- PhotoRow* _tmp43_ = NULL;
- BackingPhotoRow* _tmp44_ = NULL;
- BackingPhotoRow* _tmp45_ = NULL;
- Orientation _tmp46_ = 0;
+#line 11335 "Photo.c"
+ gchar** _tmp41_;
+ gint _tmp41__length1;
+ gchar* _tmp42_;
+ PhotoRow* _tmp43_;
+ BackingPhotoRow* _tmp44_;
+ BackingPhotoRow* _tmp45_;
+ Orientation _tmp46_;
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = list;
#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11335,7 +11359,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp46_ = _tmp45_->original_orientation;
#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp44_->original_orientation = _tmp46_;
-#line 11337 "Photo.c"
+#line 11361 "Photo.c"
}
#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = detected;
@@ -11343,32 +11367,32 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp48_ = _tmp47_->metadata;
#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp48_ != NULL) {
-#line 11345 "Photo.c"
+#line 11369 "Photo.c"
MetadataDateTime* date_time = NULL;
- DetectedPhotoInformation* _tmp49_ = NULL;
- PhotoMetadata* _tmp50_ = NULL;
- MetadataDateTime* _tmp51_ = NULL;
+ DetectedPhotoInformation* _tmp49_;
+ PhotoMetadata* _tmp50_;
+ MetadataDateTime* _tmp51_;
gboolean _tmp52_ = FALSE;
- MetadataDateTime* _tmp53_ = NULL;
- PhotoRow* _tmp60_ = NULL;
- const gchar* _tmp61_ = NULL;
- DetectedPhotoInformation* _tmp62_ = NULL;
- PhotoMetadata* _tmp63_ = NULL;
- gchar* _tmp64_ = NULL;
- gchar* _tmp65_ = NULL;
- gboolean _tmp66_ = FALSE;
- PhotoRow* _tmp69_ = NULL;
- const gchar* _tmp70_ = NULL;
- DetectedPhotoInformation* _tmp71_ = NULL;
- PhotoMetadata* _tmp72_ = NULL;
- gchar* _tmp73_ = NULL;
- gchar* _tmp74_ = NULL;
- gboolean _tmp75_ = FALSE;
- PhotoRow* _tmp78_ = NULL;
- Rating _tmp79_ = 0;
- DetectedPhotoInformation* _tmp80_ = NULL;
- PhotoMetadata* _tmp81_ = NULL;
- Rating _tmp82_ = 0;
+ MetadataDateTime* _tmp53_;
+ PhotoRow* _tmp60_;
+ const gchar* _tmp61_;
+ DetectedPhotoInformation* _tmp62_;
+ PhotoMetadata* _tmp63_;
+ gchar* _tmp64_;
+ gchar* _tmp65_;
+ gboolean _tmp66_;
+ PhotoRow* _tmp69_;
+ const gchar* _tmp70_;
+ DetectedPhotoInformation* _tmp71_;
+ PhotoMetadata* _tmp72_;
+ gchar* _tmp73_;
+ gchar* _tmp74_;
+ gboolean _tmp75_;
+ PhotoRow* _tmp78_;
+ Rating _tmp79_;
+ DetectedPhotoInformation* _tmp80_;
+ PhotoMetadata* _tmp81_;
+ Rating _tmp82_;
#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = detected;
#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11381,11 +11405,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp53_ = date_time;
#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp53_ != NULL) {
-#line 11383 "Photo.c"
- PhotoRow* _tmp54_ = NULL;
- time_t _tmp55_ = 0;
- MetadataDateTime* _tmp56_ = NULL;
- time_t _tmp57_ = 0;
+#line 11407 "Photo.c"
+ PhotoRow* _tmp54_;
+ time_t _tmp55_;
+ MetadataDateTime* _tmp56_;
+ time_t _tmp57_;
#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp54_ = updated_row;
#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11396,18 +11420,18 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp57_ = metadata_date_time_get_timestamp (_tmp56_);
#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = _tmp55_ != _tmp57_;
-#line 11398 "Photo.c"
+#line 11422 "Photo.c"
} else {
#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = FALSE;
-#line 11402 "Photo.c"
+#line 11426 "Photo.c"
}
#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp52_) {
-#line 11406 "Photo.c"
- gchar** _tmp58_ = NULL;
- gint _tmp58__length1 = 0;
- gchar* _tmp59_ = NULL;
+#line 11430 "Photo.c"
+ gchar** _tmp58_;
+ gint _tmp58__length1;
+ gchar* _tmp59_;
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = list;
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11416,7 +11440,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp59_ = g_strdup ("metadata:exposure-time");
#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp59_);
-#line 11418 "Photo.c"
+#line 11442 "Photo.c"
}
#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp60_ = updated_row;
@@ -11436,10 +11460,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_g_free0 (_tmp65_);
#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp66_) {
-#line 11438 "Photo.c"
- gchar** _tmp67_ = NULL;
- gint _tmp67__length1 = 0;
- gchar* _tmp68_ = NULL;
+#line 11462 "Photo.c"
+ gchar** _tmp67_;
+ gint _tmp67__length1;
+ gchar* _tmp68_;
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp67_ = list;
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11448,7 +11472,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp68_ = g_strdup ("metadata:name");
#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp68_);
-#line 11450 "Photo.c"
+#line 11474 "Photo.c"
}
#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = updated_row;
@@ -11468,10 +11492,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_g_free0 (_tmp74_);
#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp75_) {
-#line 11470 "Photo.c"
- gchar** _tmp76_ = NULL;
- gint _tmp76__length1 = 0;
- gchar* _tmp77_ = NULL;
+#line 11494 "Photo.c"
+ gchar** _tmp76_;
+ gint _tmp76__length1;
+ gchar* _tmp77_;
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp76_ = list;
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11480,7 +11504,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp77_ = g_strdup ("metadata:comment");
#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp77_);
-#line 11482 "Photo.c"
+#line 11506 "Photo.c"
}
#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = updated_row;
@@ -11494,10 +11518,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp82_ = photo_metadata_get_rating (_tmp81_);
#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp79_ != _tmp82_) {
-#line 11496 "Photo.c"
- gchar** _tmp83_ = NULL;
- gint _tmp83__length1 = 0;
- gchar* _tmp84_ = NULL;
+#line 11520 "Photo.c"
+ gchar** _tmp83_;
+ gint _tmp83__length1;
+ gchar* _tmp84_;
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp83_ = list;
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11506,11 +11530,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp84_ = g_strdup ("metadata:rating");
#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp84_);
-#line 11508 "Photo.c"
+#line 11532 "Photo.c"
}
#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (date_time);
-#line 11512 "Photo.c"
+#line 11536 "Photo.c"
}
#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp85_ = updated_row;
@@ -11566,27 +11590,27 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp101_ = _tmp100_->metadata;
#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp101_ != NULL) {
-#line 11568 "Photo.c"
- DetectedPhotoInformation* _tmp102_ = NULL;
- PhotoMetadata* _tmp103_ = NULL;
- PhotoMetadata* _tmp104_ = NULL;
+#line 11592 "Photo.c"
+ DetectedPhotoInformation* _tmp102_;
+ PhotoMetadata* _tmp103_;
+ PhotoMetadata* _tmp104_;
MetadataDateTime* date_time = NULL;
- DetectedPhotoInformation* _tmp105_ = NULL;
- PhotoMetadata* _tmp106_ = NULL;
- MetadataDateTime* _tmp107_ = NULL;
- MetadataDateTime* _tmp108_ = NULL;
- PhotoRow* _tmp112_ = NULL;
- DetectedPhotoInformation* _tmp113_ = NULL;
- PhotoMetadata* _tmp114_ = NULL;
- gchar* _tmp115_ = NULL;
- PhotoRow* _tmp116_ = NULL;
- DetectedPhotoInformation* _tmp117_ = NULL;
- PhotoMetadata* _tmp118_ = NULL;
- gchar* _tmp119_ = NULL;
- PhotoRow* _tmp120_ = NULL;
- DetectedPhotoInformation* _tmp121_ = NULL;
- PhotoMetadata* _tmp122_ = NULL;
- Rating _tmp123_ = 0;
+ DetectedPhotoInformation* _tmp105_;
+ PhotoMetadata* _tmp106_;
+ MetadataDateTime* _tmp107_;
+ MetadataDateTime* _tmp108_;
+ PhotoRow* _tmp112_;
+ DetectedPhotoInformation* _tmp113_;
+ PhotoMetadata* _tmp114_;
+ gchar* _tmp115_;
+ PhotoRow* _tmp116_;
+ DetectedPhotoInformation* _tmp117_;
+ PhotoMetadata* _tmp118_;
+ gchar* _tmp119_;
+ PhotoRow* _tmp120_;
+ DetectedPhotoInformation* _tmp121_;
+ PhotoMetadata* _tmp122_;
+ Rating _tmp123_;
#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp102_ = detected;
#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11609,10 +11633,10 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp108_ = date_time;
#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp108_ != NULL) {
-#line 11611 "Photo.c"
- PhotoRow* _tmp109_ = NULL;
- MetadataDateTime* _tmp110_ = NULL;
- time_t _tmp111_ = 0;
+#line 11635 "Photo.c"
+ PhotoRow* _tmp109_;
+ MetadataDateTime* _tmp110_;
+ time_t _tmp111_;
#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp109_ = updated_row;
#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11621,7 +11645,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp111_ = metadata_date_time_get_timestamp (_tmp110_);
#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp109_->exposure_time = _tmp111_;
-#line 11623 "Photo.c"
+#line 11647 "Photo.c"
}
#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp112_ = updated_row;
@@ -11659,7 +11683,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
_tmp120_->rating = _tmp123_;
#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (date_time);
-#line 11661 "Photo.c"
+#line 11685 "Photo.c"
}
#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp124_ = updated_row;
@@ -11693,15 +11717,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
if (reimport_state) {
#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
*reimport_state = _vala_reimport_state;
-#line 11695 "Photo.c"
+#line 11719 "Photo.c"
} else {
#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11699 "Photo.c"
+#line 11723 "Photo.c"
}
#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 11703 "Photo.c"
+#line 11727 "Photo.c"
}
@@ -11710,7 +11734,7 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 11712 "Photo.c"
+#line 11736 "Photo.c"
}
@@ -11719,65 +11743,65 @@ void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadat
g_return_if_fail (IS_PHOTO (self));
#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata);
-#line 11721 "Photo.c"
+#line 11745 "Photo.c"
}
static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? photo_reimport_master_state_ref (self) : NULL;
-#line 11728 "Photo.c"
+#line 11752 "Photo.c"
}
-static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) {
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11739 "Photo.c"
+#line 11763 "Photo.c"
}
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 11745 "Photo.c"
+#line 11769 "Photo.c"
}
-static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) {
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11756 "Photo.c"
+#line 11780 "Photo.c"
}
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 11762 "Photo.c"
+#line 11786 "Photo.c"
}
void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error) {
PhotoReimportMasterStateImpl* reimport_state = NULL;
- PhotoReimportMasterState* _tmp0_ = NULL;
- PhotoReimportMasterStateImpl* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- PhotoTable* _tmp3_ = NULL;
- PhotoRow* _tmp4_ = NULL;
- PhotoMetadata* _tmp20_ = NULL;
- gboolean _tmp22_ = FALSE;
- gchar** _tmp28_ = NULL;
- gint _tmp28__length1 = 0;
- PhotoMetadata* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
- gboolean _tmp35_ = FALSE;
+ PhotoReimportMasterState* _tmp0_;
+ PhotoReimportMasterStateImpl* _tmp1_;
+ PhotoTable* _tmp2_;
+ PhotoTable* _tmp3_;
+ PhotoRow* _tmp4_;
+ PhotoMetadata* _tmp20_;
+ gboolean _tmp22_;
+ gchar** _tmp28_;
+ gint _tmp28__length1;
+ PhotoMetadata* _tmp32_;
+ gboolean _tmp33_;
+ gboolean _tmp35_;
GError * _inner_error_ = NULL;
#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -11809,7 +11833,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_photo_reimport_master_state_unref0 (reimport_state);
#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 11811 "Photo.c"
+#line 11835 "Photo.c"
} else {
#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (reimport_state);
@@ -11819,31 +11843,31 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
g_clear_error (&_inner_error_);
#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 11821 "Photo.c"
+#line 11845 "Photo.c"
}
}
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11830 "Photo.c"
+#line 11854 "Photo.c"
{
BackingPhotoRow* original_master = NULL;
- PhotoRow* _tmp6_ = NULL;
- BackingPhotoRow* _tmp7_ = NULL;
- BackingPhotoRow* _tmp8_ = NULL;
- PhotoRow* _tmp9_ = NULL;
- PhotoRow* _tmp10_ = NULL;
- PhotoRow* _tmp11_ = NULL;
- BackingPhotoRow* _tmp12_ = NULL;
- BackingPhotoRow* _tmp13_ = NULL;
- PhotoRow* _tmp14_ = NULL;
- BackingPhotoRow* _tmp15_ = NULL;
- PhotoRow* _tmp16_ = NULL;
- BackingPhotoRow* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+ PhotoRow* _tmp6_;
+ BackingPhotoRow* _tmp7_;
+ BackingPhotoRow* _tmp8_;
+ PhotoRow* _tmp9_;
+ PhotoRow* _tmp10_;
+ PhotoRow* _tmp11_;
+ BackingPhotoRow* _tmp12_;
+ BackingPhotoRow* _tmp13_;
+ PhotoRow* _tmp14_;
+ BackingPhotoRow* _tmp15_;
+ PhotoRow* _tmp16_;
+ BackingPhotoRow* _tmp17_;
+ gboolean _tmp18_;
#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11886,20 +11910,20 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
if (!_tmp18_) {
#line 1503 "/home/jens/Source/shotwell/src/Photo.vala"
photo_internal_remove_all_transformations (self, FALSE);
-#line 11888 "Photo.c"
+#line 11912 "Photo.c"
}
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (original_master);
-#line 11892 "Photo.c"
+#line 11916 "Photo.c"
}
- __finally305:
+ __finally306:
{
- PhotoRow* _tmp19_ = NULL;
+ PhotoRow* _tmp19_;
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11901 "Photo.c"
+#line 11925 "Photo.c"
}
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -11911,7 +11935,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_photo_reimport_master_state_unref0 (reimport_state);
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 11913 "Photo.c"
+#line 11937 "Photo.c"
} else {
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (reimport_state);
@@ -11921,7 +11945,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
g_clear_error (&_inner_error_);
#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 11923 "Photo.c"
+#line 11947 "Photo.c"
}
}
}
@@ -11929,23 +11953,23 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_tmp20_ = reimport_state->metadata;
#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp20_ != NULL) {
-#line 11931 "Photo.c"
- PhotoMetadata* _tmp21_ = NULL;
+#line 11955 "Photo.c"
+ PhotoMetadata* _tmp21_;
#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = reimport_state->metadata;
#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
photo_apply_user_metadata_for_reimport (self, _tmp21_);
-#line 11937 "Photo.c"
+#line 11961 "Photo.c"
}
#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = reimport_state->metadata_only;
#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp22_) {
-#line 11943 "Photo.c"
- gchar** _tmp23_ = NULL;
- gint _tmp23__length1 = 0;
- gchar* _tmp24_ = NULL;
- gboolean _tmp25_ = FALSE;
+#line 11967 "Photo.c"
+ gchar** _tmp23_;
+ gint _tmp23__length1;
+ gchar* _tmp24_;
+ gboolean _tmp25_;
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = reimport_state->alterations;
#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11958,10 +11982,10 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_tmp25_ = photo_is_master_baseline (self);
#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp25_) {
-#line 11960 "Photo.c"
- gchar** _tmp26_ = NULL;
- gint _tmp26__length1 = 0;
- gchar* _tmp27_ = NULL;
+#line 11984 "Photo.c"
+ gchar** _tmp26_;
+ gint _tmp26__length1;
+ gchar* _tmp27_;
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = reimport_state->alterations;
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11970,7 +11994,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_tmp27_ = g_strdup ("image:baseline");
#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
-#line 11972 "Photo.c"
+#line 11996 "Photo.c"
}
}
#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11979,11 +12003,11 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_tmp28__length1 = reimport_state->alterations_length1;
#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp28__length1 > 0) {
-#line 11981 "Photo.c"
- gchar** _tmp29_ = NULL;
- gint _tmp29__length1 = 0;
- Alteration* _tmp30_ = NULL;
- Alteration* _tmp31_ = NULL;
+#line 12005 "Photo.c"
+ gchar** _tmp29_;
+ gint _tmp29__length1;
+ Alteration* _tmp30_;
+ Alteration* _tmp31_;
#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = reimport_state->alterations;
#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11996,7 +12020,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_);
#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp31_);
-#line 11998 "Photo.c"
+#line 12022 "Photo.c"
}
#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = reimport_state->metadata;
@@ -12006,46 +12030,46 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
_tmp33_ = photo_is_master_baseline (self);
#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp33_) {
-#line 12008 "Photo.c"
- PhotoMetadata* _tmp34_ = NULL;
+#line 12032 "Photo.c"
+ PhotoMetadata* _tmp34_;
#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = reimport_state->metadata;
#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_baseline_reimported (self, _tmp34_);
-#line 12014 "Photo.c"
+#line 12038 "Photo.c"
}
#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = photo_is_master_source (self);
#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp35_) {
-#line 12020 "Photo.c"
- PhotoMetadata* _tmp36_ = NULL;
+#line 12044 "Photo.c"
+ PhotoMetadata* _tmp36_;
#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = reimport_state->metadata;
#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_source_reimported (self, _tmp36_);
-#line 12026 "Photo.c"
+#line 12050 "Photo.c"
}
#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (reimport_state);
-#line 12030 "Photo.c"
+#line 12054 "Photo.c"
}
-static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow** backing, DetectedPhotoInformation** detected, GError** error) {
+static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error) {
BackingPhotoRow* _vala_backing = NULL;
DetectedPhotoInformation* _vala_detected = NULL;
gboolean result = FALSE;
BackingPhotoRow* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp1_;
DetectedPhotoInformation* _tmp2_ = NULL;
- BackingPhotoRow* _tmp3_ = NULL;
- BackingPhotoRow* _tmp5_ = NULL;
- BackingPhotoRow* _tmp6_ = NULL;
+ BackingPhotoRow* _tmp3_;
+ BackingPhotoRow* _tmp5_;
+ BackingPhotoRow* _tmp6_;
gboolean _tmp7_ = FALSE;
gboolean _tmp8_ = FALSE;
- DetectedPhotoInformation* _tmp9_ = NULL;
- GdkColorspace _tmp10_ = 0;
+ DetectedPhotoInformation* _tmp9_;
+ GdkColorspace _tmp10_;
GError * _inner_error_ = NULL;
#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12063,13 +12087,13 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
_tmp0_ = _tmp3_;
#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12065 "Photo.c"
+#line 12089 "Photo.c"
gboolean _tmp4_ = FALSE;
#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp4_;
-#line 12071 "Photo.c"
+#line 12095 "Photo.c"
}
#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp0_;
@@ -12091,25 +12115,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
if (backing) {
#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
*backing = _vala_backing;
-#line 12093 "Photo.c"
+#line 12117 "Photo.c"
} else {
#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_vala_backing);
-#line 12097 "Photo.c"
+#line 12121 "Photo.c"
}
#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
if (detected) {
#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
*detected = _vala_detected;
-#line 12103 "Photo.c"
+#line 12127 "Photo.c"
} else {
#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (_vala_detected);
-#line 12107 "Photo.c"
+#line 12131 "Photo.c"
}
#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12111 "Photo.c"
+#line 12135 "Photo.c"
}
#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = _vala_detected;
@@ -12119,40 +12143,40 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
if (_tmp10_ != GDK_COLORSPACE_RGB) {
#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = TRUE;
-#line 12121 "Photo.c"
+#line 12145 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp11_ = NULL;
- gint _tmp12_ = 0;
+ DetectedPhotoInformation* _tmp11_;
+ gint _tmp12_;
#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _vala_detected;
#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _tmp11_->channels;
#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _tmp12_ < 3;
-#line 12131 "Photo.c"
+#line 12155 "Photo.c"
}
#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = TRUE;
-#line 12137 "Photo.c"
+#line 12161 "Photo.c"
} else {
- DetectedPhotoInformation* _tmp13_ = NULL;
- gint _tmp14_ = 0;
+ DetectedPhotoInformation* _tmp13_;
+ gint _tmp14_;
#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _vala_detected;
#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = _tmp13_->bits_per_channel;
#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _tmp14_ != 8;
-#line 12147 "Photo.c"
+#line 12171 "Photo.c"
}
#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_) {
-#line 12151 "Photo.c"
- GFile* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+#line 12175 "Photo.c"
+ GFile* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = file;
#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12171,25 +12195,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
if (backing) {
#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
*backing = _vala_backing;
-#line 12173 "Photo.c"
+#line 12197 "Photo.c"
} else {
#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_vala_backing);
-#line 12177 "Photo.c"
+#line 12201 "Photo.c"
}
#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
if (detected) {
#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
*detected = _vala_detected;
-#line 12183 "Photo.c"
+#line 12207 "Photo.c"
} else {
#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (_vala_detected);
-#line 12187 "Photo.c"
+#line 12211 "Photo.c"
}
#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12191 "Photo.c"
+#line 12215 "Photo.c"
}
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
@@ -12199,45 +12223,45 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
if (backing) {
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
*backing = _vala_backing;
-#line 12201 "Photo.c"
+#line 12225 "Photo.c"
} else {
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_vala_backing);
-#line 12205 "Photo.c"
+#line 12229 "Photo.c"
}
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
if (detected) {
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
*detected = _vala_detected;
-#line 12211 "Photo.c"
+#line 12235 "Photo.c"
} else {
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (_vala_detected);
-#line 12215 "Photo.c"
+#line 12239 "Photo.c"
}
#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12219 "Photo.c"
+#line 12243 "Photo.c"
}
-gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState** state, GError** error) {
+gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditableState* * state, GError** error) {
PhotoReimportEditableState* _vala_state = NULL;
gboolean result = FALSE;
GFile* file = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
DetectedPhotoInformation* detected = NULL;
BackingPhotoRow* backing = NULL;
gboolean _tmp2_ = FALSE;
- GFile* _tmp3_ = NULL;
+ GFile* _tmp3_;
BackingPhotoRow* _tmp4_ = NULL;
DetectedPhotoInformation* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- BackingPhotoRow* _tmp8_ = NULL;
- DetectedPhotoInformation* _tmp9_ = NULL;
- PhotoMetadata* _tmp10_ = NULL;
- PhotoReimportEditableStateImpl* _tmp11_ = NULL;
+ gboolean _tmp6_;
+ BackingPhotoRow* _tmp8_;
+ DetectedPhotoInformation* _tmp9_;
+ PhotoMetadata* _tmp10_;
+ PhotoReimportEditableStateImpl* _tmp11_;
GError * _inner_error_ = NULL;
#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12261,15 +12285,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
if (state) {
#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 12263 "Photo.c"
+#line 12287 "Photo.c"
} else {
#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12267 "Photo.c"
+#line 12291 "Photo.c"
}
#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12271 "Photo.c"
+#line 12295 "Photo.c"
}
#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = file;
@@ -12287,7 +12311,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
_tmp2_ = _tmp6_;
#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12289 "Photo.c"
+#line 12313 "Photo.c"
gboolean _tmp7_ = FALSE;
#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -12299,7 +12323,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
_g_object_unref0 (file);
#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp7_;
-#line 12301 "Photo.c"
+#line 12325 "Photo.c"
}
#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp2_) {
@@ -12315,15 +12339,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
if (state) {
#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 12317 "Photo.c"
+#line 12341 "Photo.c"
} else {
#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12321 "Photo.c"
+#line 12345 "Photo.c"
}
#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12325 "Photo.c"
+#line 12349 "Photo.c"
}
#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = backing;
@@ -12349,47 +12373,47 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
if (state) {
#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 12351 "Photo.c"
+#line 12375 "Photo.c"
} else {
#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12355 "Photo.c"
+#line 12379 "Photo.c"
}
#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12359 "Photo.c"
+#line 12383 "Photo.c"
}
static gpointer _photo_reimport_editable_state_ref0 (gpointer self) {
#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? photo_reimport_editable_state_ref (self) : NULL;
-#line 12366 "Photo.c"
+#line 12390 "Photo.c"
}
void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* state, GError** error) {
BackingPhotoID editable_id = {0};
BackingPhotoID _tmp0_ = {0};
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
PhotoReimportEditableStateImpl* reimport_state = NULL;
- PhotoReimportEditableState* _tmp2_ = NULL;
- PhotoReimportEditableStateImpl* _tmp3_ = NULL;
- PhotoReimportEditableStateImpl* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- PhotoReimportEditableStateImpl* _tmp21_ = NULL;
- PhotoMetadata* _tmp22_ = NULL;
+ PhotoReimportEditableState* _tmp2_;
+ PhotoReimportEditableStateImpl* _tmp3_;
+ PhotoReimportEditableStateImpl* _tmp4_;
+ gboolean _tmp5_;
+ PhotoReimportEditableStateImpl* _tmp21_;
+ PhotoMetadata* _tmp22_;
gchar* list = NULL;
- gchar* _tmp36_ = NULL;
- PhotoReimportEditableStateImpl* _tmp37_ = NULL;
- gboolean _tmp38_ = FALSE;
- const gchar* _tmp41_ = NULL;
- Alteration* _tmp42_ = NULL;
- Alteration* _tmp43_ = NULL;
- PhotoReimportEditableStateImpl* _tmp44_ = NULL;
- PhotoMetadata* _tmp45_ = NULL;
- gboolean _tmp46_ = FALSE;
- gboolean _tmp49_ = FALSE;
+ gchar* _tmp36_;
+ PhotoReimportEditableStateImpl* _tmp37_;
+ gboolean _tmp38_;
+ const gchar* _tmp41_;
+ Alteration* _tmp42_;
+ Alteration* _tmp43_;
+ PhotoReimportEditableStateImpl* _tmp44_;
+ PhotoMetadata* _tmp45_;
+ gboolean _tmp46_;
+ gboolean _tmp49_;
GError * _inner_error_ = NULL;
#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -12405,7 +12429,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
if (_tmp1_) {
#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12407 "Photo.c"
+#line 12431 "Photo.c"
}
#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = state;
@@ -12419,11 +12443,11 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_tmp5_ = _tmp4_->metadata_only;
#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp5_) {
-#line 12421 "Photo.c"
- BackingPhotoTable* _tmp6_ = NULL;
- BackingPhotoTable* _tmp7_ = NULL;
- PhotoReimportEditableStateImpl* _tmp8_ = NULL;
- BackingPhotoRow* _tmp9_ = NULL;
+#line 12445 "Photo.c"
+ BackingPhotoTable* _tmp6_;
+ BackingPhotoTable* _tmp7_;
+ PhotoReimportEditableStateImpl* _tmp8_;
+ BackingPhotoRow* _tmp9_;
#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = backing_photo_table_get_instance ();
#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12446,7 +12470,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_photo_reimport_editable_state_unref0 (reimport_state);
#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12448 "Photo.c"
+#line 12472 "Photo.c"
} else {
#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12456,23 +12480,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
g_clear_error (&_inner_error_);
#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12458 "Photo.c"
+#line 12482 "Photo.c"
}
}
{
- PhotoRow* _tmp10_ = NULL;
+ PhotoRow* _tmp10_;
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->row;
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12467 "Photo.c"
+#line 12491 "Photo.c"
{
- PhotoReimportEditableStateImpl* _tmp11_ = NULL;
- BackingPhotoRow* _tmp12_ = NULL;
- BackingPhotoRow* _tmp13_ = NULL;
- PhotoReimportEditableStateImpl* _tmp14_ = NULL;
- BackingPhotoRow* _tmp15_ = NULL;
- Orientation _tmp16_ = 0;
+ PhotoReimportEditableStateImpl* _tmp11_;
+ BackingPhotoRow* _tmp12_;
+ BackingPhotoRow* _tmp13_;
+ PhotoReimportEditableStateImpl* _tmp14_;
+ BackingPhotoRow* _tmp15_;
+ Orientation _tmp16_;
#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = reimport_state;
#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12493,16 +12517,16 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
photo_set_orientation (self, _tmp16_);
#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
photo_internal_remove_all_transformations (self, FALSE);
-#line 12495 "Photo.c"
+#line 12519 "Photo.c"
}
- __finally306:
+ __finally307:
{
- PhotoRow* _tmp17_ = NULL;
+ PhotoRow* _tmp17_;
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = self->row;
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12504 "Photo.c"
+#line 12528 "Photo.c"
}
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12514,7 +12538,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_photo_reimport_editable_state_unref0 (reimport_state);
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12516 "Photo.c"
+#line 12540 "Photo.c"
} else {
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12524,14 +12548,14 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
g_clear_error (&_inner_error_);
#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12526 "Photo.c"
+#line 12550 "Photo.c"
}
}
}
} else {
- PhotoReimportEditableStateImpl* _tmp18_ = NULL;
- BackingPhotoRow* _tmp19_ = NULL;
- Orientation _tmp20_ = 0;
+ PhotoReimportEditableStateImpl* _tmp18_;
+ BackingPhotoRow* _tmp19_;
+ Orientation _tmp20_;
#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = reimport_state;
#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12540,7 +12564,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_tmp20_ = _tmp19_->original_orientation;
#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_orientation (self, _tmp20_);
-#line 12542 "Photo.c"
+#line 12566 "Photo.c"
}
#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = reimport_state;
@@ -12548,20 +12572,20 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_tmp22_ = _tmp21_->metadata;
#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_ != NULL) {
-#line 12550 "Photo.c"
- PhotoReimportEditableStateImpl* _tmp23_ = NULL;
- PhotoMetadata* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- PhotoReimportEditableStateImpl* _tmp27_ = NULL;
- PhotoMetadata* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- PhotoReimportEditableStateImpl* _tmp31_ = NULL;
- PhotoMetadata* _tmp32_ = NULL;
- Rating _tmp33_ = 0;
- PhotoReimportEditableStateImpl* _tmp34_ = NULL;
- PhotoMetadata* _tmp35_ = NULL;
+#line 12574 "Photo.c"
+ PhotoReimportEditableStateImpl* _tmp23_;
+ PhotoMetadata* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ PhotoReimportEditableStateImpl* _tmp27_;
+ PhotoMetadata* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ PhotoReimportEditableStateImpl* _tmp31_;
+ PhotoMetadata* _tmp32_;
+ Rating _tmp33_;
+ PhotoReimportEditableStateImpl* _tmp34_;
+ PhotoMetadata* _tmp35_;
#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = reimport_state;
#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12600,7 +12624,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_tmp35_ = _tmp34_->metadata;
#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
photo_apply_user_metadata_for_reimport (self, _tmp35_);
-#line 12602 "Photo.c"
+#line 12626 "Photo.c"
}
#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -12612,9 +12636,9 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_tmp38_ = _tmp37_->metadata_only;
#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp38_) {
-#line 12614 "Photo.c"
- const gchar* _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
+#line 12638 "Photo.c"
+ const gchar* _tmp39_;
+ gchar* _tmp40_;
#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = list;
#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12623,7 +12647,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_g_free0 (list);
#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
list = _tmp40_;
-#line 12625 "Photo.c"
+#line 12649 "Photo.c"
}
#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = list;
@@ -12645,59 +12669,59 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
_tmp46_ = photo_is_editable_baseline (self);
#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp46_) {
-#line 12647 "Photo.c"
- PhotoReimportEditableStateImpl* _tmp47_ = NULL;
- PhotoMetadata* _tmp48_ = NULL;
+#line 12671 "Photo.c"
+ PhotoReimportEditableStateImpl* _tmp47_;
+ PhotoMetadata* _tmp48_;
#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = reimport_state;
#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp48_ = _tmp47_->metadata;
#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_baseline_reimported (self, _tmp48_);
-#line 12656 "Photo.c"
+#line 12680 "Photo.c"
}
#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = photo_is_editable_source (self);
#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp49_) {
-#line 12662 "Photo.c"
- PhotoReimportEditableStateImpl* _tmp50_ = NULL;
- PhotoMetadata* _tmp51_ = NULL;
+#line 12686 "Photo.c"
+ PhotoReimportEditableStateImpl* _tmp50_;
+ PhotoMetadata* _tmp51_;
#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = reimport_state;
#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp51_ = _tmp50_->metadata;
#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_source_reimported (self, _tmp51_);
-#line 12671 "Photo.c"
+#line 12695 "Photo.c"
}
#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (list);
#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (reimport_state);
-#line 12677 "Photo.c"
+#line 12701 "Photo.c"
}
static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) {
#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? photo_reimport_raw_development_state_ref (self) : NULL;
-#line 12684 "Photo.c"
+#line 12708 "Photo.c"
}
-gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState** state, GError** error) {
+gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* * state, GError** error) {
PhotoReimportRawDevelopmentState* _vala_state = NULL;
gboolean result = FALSE;
GeeCollection* files = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp2_ = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp19_ = NULL;
- PhotoReimportRawDevelopmentState* _tmp20_ = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp21_ = NULL;
- gint _tmp22_ = 0;
+ PhotoReimportRawDevelopmentStateImpl* _tmp2_;
+ PhotoReimportRawDevelopmentStateImpl* _tmp19_;
+ PhotoReimportRawDevelopmentState* _tmp20_;
+ PhotoReimportRawDevelopmentStateImpl* _tmp21_;
+ gint _tmp22_;
GError * _inner_error_ = NULL;
#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12721,25 +12745,25 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
if (state) {
#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 12723 "Photo.c"
+#line 12747 "Photo.c"
} else {
#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12727 "Photo.c"
+#line 12751 "Photo.c"
}
#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12731 "Photo.c"
+#line 12755 "Photo.c"
}
#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = photo_reimport_raw_development_state_impl_new ();
#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
reimport_state = _tmp2_;
-#line 12737 "Photo.c"
+#line 12761 "Photo.c"
{
GeeIterator* _file_it = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = files;
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12748,23 +12772,23 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
_file_it = _tmp4_;
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 12750 "Photo.c"
- GeeIterator* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 12774 "Photo.c"
+ GeeIterator* _tmp5_;
+ gboolean _tmp6_;
GFile* file = NULL;
- GeeIterator* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
DetectedPhotoInformation* detected = NULL;
BackingPhotoRow* backing = NULL;
gboolean _tmp9_ = FALSE;
- GFile* _tmp10_ = NULL;
+ GFile* _tmp10_;
BackingPhotoRow* _tmp11_ = NULL;
DetectedPhotoInformation* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
- PhotoReimportRawDevelopmentStateImpl* _tmp15_ = NULL;
- BackingPhotoRow* _tmp16_ = NULL;
- DetectedPhotoInformation* _tmp17_ = NULL;
- PhotoMetadata* _tmp18_ = NULL;
+ gboolean _tmp13_;
+ PhotoReimportRawDevelopmentStateImpl* _tmp15_;
+ BackingPhotoRow* _tmp16_;
+ DetectedPhotoInformation* _tmp17_;
+ PhotoMetadata* _tmp18_;
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _file_it;
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12773,7 +12797,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
if (!_tmp6_) {
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 12775 "Photo.c"
+#line 12799 "Photo.c"
}
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _file_it;
@@ -12797,7 +12821,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
_tmp9_ = _tmp13_;
#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12799 "Photo.c"
+#line 12823 "Photo.c"
gboolean _tmp14_ = FALSE;
#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -12815,7 +12839,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
_g_object_unref0 (files);
#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp14_;
-#line 12817 "Photo.c"
+#line 12841 "Photo.c"
}
#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp9_) {
@@ -12827,7 +12851,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
_g_object_unref0 (file);
#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
continue;
-#line 12829 "Photo.c"
+#line 12853 "Photo.c"
}
#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = reimport_state;
@@ -12845,11 +12869,11 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
_detected_photo_information_unref0 (detected);
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (file);
-#line 12847 "Photo.c"
+#line 12871 "Photo.c"
}
#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_file_it);
-#line 12851 "Photo.c"
+#line 12875 "Photo.c"
}
#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = reimport_state;
@@ -12873,30 +12897,30 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
if (state) {
#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 12875 "Photo.c"
+#line 12899 "Photo.c"
} else {
#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12879 "Photo.c"
+#line 12903 "Photo.c"
}
#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 12883 "Photo.c"
+#line 12907 "Photo.c"
}
void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelopmentState* state, GError** error) {
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL;
- PhotoReimportRawDevelopmentState* _tmp1_ = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp2_ = NULL;
+ PhotoReimportRawDevelopmentState* _tmp1_;
+ PhotoReimportRawDevelopmentStateImpl* _tmp2_;
gchar* list = NULL;
- gchar* _tmp32_ = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp33_ = NULL;
- gboolean _tmp34_ = FALSE;
- const gchar* _tmp37_ = NULL;
- Alteration* _tmp38_ = NULL;
- Alteration* _tmp39_ = NULL;
+ gchar* _tmp32_;
+ PhotoReimportRawDevelopmentStateImpl* _tmp33_;
+ gboolean _tmp34_;
+ const gchar* _tmp37_;
+ Alteration* _tmp38_;
+ Alteration* _tmp39_;
GError * _inner_error_ = NULL;
#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -12908,7 +12932,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12910 "Photo.c"
+#line 12934 "Photo.c"
}
#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = state;
@@ -12916,12 +12940,12 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl));
#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
reimport_state = _tmp2_;
-#line 12918 "Photo.c"
+#line 12942 "Photo.c"
{
GeeIterator* _dev_it = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ PhotoReimportRawDevelopmentStateImpl* _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = reimport_state;
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12932,14 +12956,14 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_dev_it = _tmp5_;
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 12934 "Photo.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 12958 "Photo.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- PhotoReimportRawDevelopmentStateImpl* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ PhotoReimportRawDevelopmentStateImpl* _tmp10_;
+ gboolean _tmp11_;
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _dev_it;
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12948,7 +12972,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
if (!_tmp7_) {
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 12950 "Photo.c"
+#line 12974 "Photo.c"
}
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _dev_it;
@@ -12962,11 +12986,11 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_tmp11_ = _tmp10_->metadata_only;
#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp11_) {
-#line 12964 "Photo.c"
- BackingPhotoTable* _tmp12_ = NULL;
- BackingPhotoTable* _tmp13_ = NULL;
- PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL;
- BackingPhotoRow* _tmp15_ = NULL;
+#line 12988 "Photo.c"
+ BackingPhotoTable* _tmp12_;
+ BackingPhotoTable* _tmp13_;
+ PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_;
+ BackingPhotoRow* _tmp15_;
#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = backing_photo_table_get_instance ();
#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12993,7 +13017,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_photo_reimport_raw_development_state_unref0 (reimport_state);
#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 12995 "Photo.c"
+#line 13019 "Photo.c"
} else {
#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -13007,22 +13031,22 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
g_clear_error (&_inner_error_);
#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13009 "Photo.c"
+#line 13033 "Photo.c"
}
}
{
- PhotoRow* _tmp16_ = NULL;
+ PhotoRow* _tmp16_;
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->row;
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13018 "Photo.c"
+#line 13042 "Photo.c"
{
- gint _tmp17_ = 0;
- RawDeveloper* _tmp18_ = NULL;
+ gint _tmp17_;
+ RawDeveloper* _tmp18_;
#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 13024 "Photo.c"
+#line 13048 "Photo.c"
{
RawDeveloper* d_collection = NULL;
gint d_collection_length1 = 0;
@@ -13034,20 +13058,20 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
d_collection_length1 = _tmp17_;
#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) {
-#line 13036 "Photo.c"
+#line 13060 "Photo.c"
RawDeveloper d = 0;
#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
d = d_collection[d_it];
-#line 13040 "Photo.c"
+#line 13064 "Photo.c"
{
BackingPhotoID id = {0};
- PhotoRow* _tmp19_ = NULL;
- BackingPhotoID* _tmp20_ = NULL;
- gint _tmp20__length1 = 0;
- RawDeveloper _tmp21_ = 0;
- BackingPhotoID _tmp22_ = {0};
- BackingPhotoID _tmp23_ = {0};
- gint64 _tmp24_ = 0LL;
+ PhotoRow* _tmp19_;
+ BackingPhotoID* _tmp20_;
+ gint _tmp20__length1;
+ RawDeveloper _tmp21_;
+ BackingPhotoID _tmp22_;
+ BackingPhotoID _tmp23_;
+ gint64 _tmp24_;
#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13066,11 +13090,11 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_tmp24_ = _tmp23_.id;
#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp24_ != BACKING_PHOTO_ID_INVALID) {
-#line 13068 "Photo.c"
+#line 13092 "Photo.c"
BackingPhotoRow* bpr = NULL;
- BackingPhotoID _tmp25_ = {0};
- BackingPhotoRow* _tmp26_ = NULL;
- BackingPhotoRow* _tmp27_ = NULL;
+ BackingPhotoID _tmp25_;
+ BackingPhotoRow* _tmp26_;
+ BackingPhotoRow* _tmp27_;
#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = id;
#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13081,10 +13105,10 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_tmp27_ = bpr;
#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp27_ != NULL) {
-#line 13083 "Photo.c"
- GeeHashMap* _tmp28_ = NULL;
- RawDeveloper _tmp29_ = 0;
- BackingPhotoRow* _tmp30_ = NULL;
+#line 13107 "Photo.c"
+ GeeHashMap* _tmp28_;
+ RawDeveloper _tmp29_;
+ BackingPhotoRow* _tmp30_;
#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = self->priv->developments;
#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13093,27 +13117,27 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_tmp30_ = bpr;
#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_);
-#line 13095 "Photo.c"
+#line 13119 "Photo.c"
}
#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (bpr);
-#line 13099 "Photo.c"
+#line 13123 "Photo.c"
}
}
}
#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
d_collection = (g_free (d_collection), NULL);
-#line 13105 "Photo.c"
+#line 13129 "Photo.c"
}
}
- __finally307:
+ __finally308:
{
- PhotoRow* _tmp31_ = NULL;
+ PhotoRow* _tmp31_;
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = self->row;
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13115 "Photo.c"
+#line 13139 "Photo.c"
}
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13129,7 +13153,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_photo_reimport_raw_development_state_unref0 (reimport_state);
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13131 "Photo.c"
+#line 13155 "Photo.c"
} else {
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -13143,18 +13167,18 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
g_clear_error (&_inner_error_);
#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13145 "Photo.c"
+#line 13169 "Photo.c"
}
}
}
}
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13152 "Photo.c"
+#line 13176 "Photo.c"
}
#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_dev_it);
-#line 13156 "Photo.c"
+#line 13180 "Photo.c"
}
#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -13166,9 +13190,9 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_tmp34_ = _tmp33_->metadata_only;
#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp34_) {
-#line 13168 "Photo.c"
- const gchar* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
+#line 13192 "Photo.c"
+ const gchar* _tmp35_;
+ gchar* _tmp36_;
#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = list;
#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13177,7 +13201,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_g_free0 (list);
#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
list = _tmp36_;
-#line 13179 "Photo.c"
+#line 13203 "Photo.c"
}
#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = list;
@@ -13195,14 +13219,14 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
_g_free0 (list);
#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 13197 "Photo.c"
+#line 13221 "Photo.c"
}
static gchar* photo_real_get_typename (DataSource* base) {
Photo * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13211,7 +13235,7 @@ static gchar* photo_real_get_typename (DataSource* base) {
result = _tmp0_;
#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13213 "Photo.c"
+#line 13237 "Photo.c"
}
@@ -13219,7 +13243,7 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
Photo * self;
gint64 result = 0LL;
PhotoID _tmp0_ = {0};
- gint64 _tmp1_ = 0LL;
+ gint64 _tmp1_;
#line 1669 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13230,18 +13254,18 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
result = _tmp1_;
#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13232 "Photo.c"
+#line 13256 "Photo.c"
}
static gchar* photo_real_get_source_id (DataSource* base) {
Photo * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gint64 _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1673 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13260,15 +13284,15 @@ static gchar* photo_real_get_source_id (DataSource* base) {
result = _tmp4_;
#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13262 "Photo.c"
+#line 13286 "Photo.c"
}
void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
GTimeVal modification = {0};
- GFileInfo* _tmp0_ = NULL;
+ GFileInfo* _tmp0_;
GTimeVal _tmp1_ = {0};
- gboolean _tmp21_ = FALSE;
+ gboolean _tmp21_;
GError * _inner_error_ = NULL;
#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -13280,31 +13304,31 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
g_file_info_get_modification_time (_tmp0_, &_tmp1_);
#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
modification = _tmp1_;
-#line 13282 "Photo.c"
+#line 13306 "Photo.c"
{
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13290 "Photo.c"
+#line 13314 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
- BackingPhotoRow* _tmp4_ = NULL;
- time_t _tmp5_ = 0;
- GTimeVal _tmp6_ = {0};
- glong _tmp7_ = 0L;
- PhotoTable* _tmp9_ = NULL;
- PhotoTable* _tmp10_ = NULL;
- PhotoRow* _tmp11_ = NULL;
- PhotoID _tmp12_ = {0};
- GTimeVal _tmp13_ = {0};
- glong _tmp14_ = 0L;
- PhotoRow* _tmp15_ = NULL;
- BackingPhotoRow* _tmp16_ = NULL;
- GTimeVal _tmp17_ = {0};
- glong _tmp18_ = 0L;
+ PhotoRow* _tmp3_;
+ BackingPhotoRow* _tmp4_;
+ time_t _tmp5_;
+ GTimeVal _tmp6_;
+ glong _tmp7_;
+ PhotoTable* _tmp9_;
+ PhotoTable* _tmp10_;
+ PhotoRow* _tmp11_;
+ PhotoID _tmp12_;
+ GTimeVal _tmp13_;
+ glong _tmp14_;
+ PhotoRow* _tmp15_;
+ BackingPhotoRow* _tmp16_;
+ GTimeVal _tmp17_;
+ glong _tmp18_;
#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13317,18 +13341,18 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
_tmp7_ = _tmp6_.tv_sec;
#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_ == ((time_t) _tmp7_)) {
-#line 13319 "Photo.c"
+#line 13343 "Photo.c"
{
- PhotoRow* _tmp8_ = NULL;
+ PhotoRow* _tmp8_;
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->row;
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13326 "Photo.c"
+#line 13350 "Photo.c"
}
#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13330 "Photo.c"
+#line 13354 "Photo.c"
}
#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = photo_table_get_instance ();
@@ -13348,8 +13372,8 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
_database_table_unref0 (_tmp10_);
#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13350 "Photo.c"
- goto __finally309;
+#line 13374 "Photo.c"
+ goto __finally310;
}
#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = self->row;
@@ -13361,23 +13385,23 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
_tmp18_ = _tmp17_.tv_sec;
#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_->timestamp = (time_t) _tmp18_;
-#line 13363 "Photo.c"
+#line 13387 "Photo.c"
}
- __finally309:
+ __finally310:
{
- PhotoRow* _tmp19_ = NULL;
+ PhotoRow* _tmp19_;
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13372 "Photo.c"
+#line 13396 "Photo.c"
}
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 13378 "Photo.c"
- goto __catch308_database_error;
+#line 13402 "Photo.c"
+ goto __catch309_database_error;
}
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -13385,15 +13409,15 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
g_clear_error (&_inner_error_);
#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13387 "Photo.c"
+#line 13411 "Photo.c"
}
}
}
- goto __finally308;
- __catch308_database_error:
+ goto __finally309;
+ __catch309_database_error:
{
GError* err = NULL;
- GError* _tmp20_ = NULL;
+ GError* _tmp20_;
#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13406,9 +13430,9 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
_g_error_free0 (err);
#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13408 "Photo.c"
+#line 13432 "Photo.c"
}
- __finally308:
+ __finally309:
#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13417,15 +13441,15 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
g_clear_error (&_inner_error_);
#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13419 "Photo.c"
+#line 13443 "Photo.c"
}
#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = photo_is_master_baseline (self);
#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_) {
-#line 13425 "Photo.c"
- Alteration* _tmp22_ = NULL;
- Alteration* _tmp23_ = NULL;
+#line 13449 "Photo.c"
+ Alteration* _tmp22_;
+ Alteration* _tmp23_;
#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp");
#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13434,10 +13458,10 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp23_);
-#line 13436 "Photo.c"
+#line 13460 "Photo.c"
} else {
- Alteration* _tmp24_ = NULL;
- Alteration* _tmp25_ = NULL;
+ Alteration* _tmp24_;
+ Alteration* _tmp25_;
#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = alteration_new ("metadata", "master-timestamp");
#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13446,17 +13470,17 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp25_);
-#line 13448 "Photo.c"
+#line 13472 "Photo.c"
}
}
void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GError** error) {
GTimeVal modification = {0};
- GFileInfo* _tmp0_ = NULL;
+ GFileInfo* _tmp0_;
GTimeVal _tmp1_ = {0};
gboolean altered = FALSE;
- gboolean _tmp20_ = FALSE;
+ gboolean _tmp20_;
GError * _inner_error_ = NULL;
#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -13470,29 +13494,29 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
modification = _tmp1_;
#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
altered = FALSE;
-#line 13472 "Photo.c"
+#line 13496 "Photo.c"
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13479 "Photo.c"
+#line 13503 "Photo.c"
{
gboolean _tmp3_ = FALSE;
- PhotoRow* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ PhotoRow* _tmp4_;
+ gboolean _tmp5_;
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 13490 "Photo.c"
- BackingPhotoRow* _tmp6_ = NULL;
- time_t _tmp7_ = 0;
- GTimeVal _tmp8_ = {0};
- glong _tmp9_ = 0L;
+#line 13514 "Photo.c"
+ BackingPhotoRow* _tmp6_;
+ time_t _tmp7_;
+ GTimeVal _tmp8_;
+ glong _tmp9_;
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->editable;
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13503,24 +13527,24 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
_tmp9_ = _tmp8_.tv_sec;
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp7_ != ((time_t) _tmp9_);
-#line 13505 "Photo.c"
+#line 13529 "Photo.c"
} else {
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = FALSE;
-#line 13509 "Photo.c"
+#line 13533 "Photo.c"
}
#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp3_) {
-#line 13513 "Photo.c"
- BackingPhotoTable* _tmp10_ = NULL;
- BackingPhotoTable* _tmp11_ = NULL;
- PhotoRow* _tmp12_ = NULL;
- BackingPhotoID _tmp13_ = {0};
- GTimeVal _tmp14_ = {0};
- glong _tmp15_ = 0L;
- BackingPhotoRow* _tmp16_ = NULL;
- GTimeVal _tmp17_ = {0};
- glong _tmp18_ = 0L;
+#line 13537 "Photo.c"
+ BackingPhotoTable* _tmp10_;
+ BackingPhotoTable* _tmp11_;
+ PhotoRow* _tmp12_;
+ BackingPhotoID _tmp13_;
+ GTimeVal _tmp14_;
+ glong _tmp15_;
+ BackingPhotoRow* _tmp16_;
+ GTimeVal _tmp17_;
+ glong _tmp18_;
#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = backing_photo_table_get_instance ();
#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13539,8 +13563,8 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
_database_table_unref0 (_tmp11_);
#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13541 "Photo.c"
- goto __finally310;
+#line 13565 "Photo.c"
+ goto __finally311;
}
#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->priv->editable;
@@ -13552,17 +13576,17 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
_tmp16_->timestamp = (time_t) _tmp18_;
#line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
altered = TRUE;
-#line 13554 "Photo.c"
+#line 13578 "Photo.c"
}
}
- __finally310:
+ __finally311:
{
- PhotoRow* _tmp19_ = NULL;
+ PhotoRow* _tmp19_;
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13564 "Photo.c"
+#line 13588 "Photo.c"
}
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13572,7 +13596,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
g_propagate_error (error, _inner_error_);
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13574 "Photo.c"
+#line 13598 "Photo.c"
} else {
#line 1709 "/home/jens/Source/shotwell/src/Photo.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);
@@ -13580,7 +13604,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
g_clear_error (&_inner_error_);
#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13582 "Photo.c"
+#line 13606 "Photo.c"
}
}
}
@@ -13588,9 +13612,9 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
_tmp20_ = altered;
#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp20_) {
-#line 13590 "Photo.c"
- Alteration* _tmp21_ = NULL;
- Alteration* _tmp22_ = NULL;
+#line 13614 "Photo.c"
+ Alteration* _tmp21_;
+ Alteration* _tmp22_;
#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp");
#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13599,7 +13623,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_);
#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp22_);
-#line 13601 "Photo.c"
+#line 13625 "Photo.c"
}
}
@@ -13610,15 +13634,15 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
g_return_if_fail (GEE_IS_MAP (map));
#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
database_table_begin_transaction ();
-#line 13612 "Photo.c"
+#line 13636 "Photo.c"
{
GeeIterator* _photo_it = NULL;
- GeeMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = map;
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13637,17 +13661,17 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
_photo_it = _tmp5_;
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 13639 "Photo.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 13663 "Photo.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
Photo* photo = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- GeeMap* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
- gpointer _tmp13_ = NULL;
- GFileInfo* _tmp14_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ Photo* _tmp10_;
+ GeeMap* _tmp11_;
+ Photo* _tmp12_;
+ gpointer _tmp13_;
+ GFileInfo* _tmp14_;
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _photo_it;
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13656,7 +13680,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
if (!_tmp7_) {
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 13658 "Photo.c"
+#line 13682 "Photo.c"
}
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _photo_it;
@@ -13690,7 +13714,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
_g_object_unref0 (_photo_it);
#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13692 "Photo.c"
+#line 13716 "Photo.c"
} else {
#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
@@ -13702,16 +13726,16 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
g_clear_error (&_inner_error_);
#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13704 "Photo.c"
+#line 13728 "Photo.c"
}
}
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 13709 "Photo.c"
+#line 13733 "Photo.c"
}
#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_photo_it);
-#line 13713 "Photo.c"
+#line 13737 "Photo.c"
}
#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
database_table_commit_transaction (&_inner_error_);
@@ -13723,7 +13747,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
g_propagate_error (error, _inner_error_);
#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13725 "Photo.c"
+#line 13749 "Photo.c"
} else {
#line 1728 "/home/jens/Source/shotwell/src/Photo.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);
@@ -13731,7 +13755,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
g_clear_error (&_inner_error_);
#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 13733 "Photo.c"
+#line 13757 "Photo.c"
}
}
}
@@ -13741,8 +13765,8 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
Photo * self;
PhotoFileFormat result = 0;
PhotoFileFormat _tmp0_ = 0;
- PhotoFileFormat _tmp1_ = 0;
- gboolean _tmp2_ = FALSE;
+ PhotoFileFormat _tmp1_;
+ gboolean _tmp2_;
#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13751,26 +13775,26 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
_tmp2_ = photo_file_format_can_write_image (_tmp1_);
#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 13753 "Photo.c"
- PhotoFileFormat _tmp3_ = 0;
+#line 13777 "Photo.c"
+ PhotoFileFormat _tmp3_;
#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = photo_get_file_format (self);
#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp3_;
-#line 13759 "Photo.c"
+#line 13783 "Photo.c"
} else {
- PhotoFileFormat _tmp4_ = 0;
+ PhotoFileFormat _tmp4_;
#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_file_format_get_system_default_format ();
#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp4_;
-#line 13766 "Photo.c"
+#line 13790 "Photo.c"
}
#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13772 "Photo.c"
+#line 13796 "Photo.c"
}
@@ -13778,10 +13802,10 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
Photo * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ gint _tmp1_;
Scaling _tmp2_ = {0};
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
GError * _inner_error_ = NULL;
#line 1736 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -13799,7 +13823,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
g_propagate_error (error, _inner_error_);
#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 13801 "Photo.c"
+#line 13825 "Photo.c"
}
#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp0_;
@@ -13811,15 +13835,15 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
_g_object_unref0 (_tmp0_);
#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13813 "Photo.c"
+#line 13837 "Photo.c"
}
gboolean photo_is_file_image (GFile* file) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- GFile* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GFile* _tmp1_;
+ gboolean _tmp2_;
#line 1740 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13830,12 +13854,12 @@ gboolean photo_is_file_image (GFile* file) {
if (_tmp2_) {
#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = TRUE;
-#line 13832 "Photo.c"
+#line 13856 "Photo.c"
} else {
- GFile* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ GFile* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gboolean _tmp6_;
#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = file;
#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13848,13 +13872,13 @@ gboolean photo_is_file_image (GFile* file) {
_tmp0_ = _tmp6_;
#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp5_);
-#line 13850 "Photo.c"
+#line 13874 "Photo.c"
}
#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13856 "Photo.c"
+#line 13880 "Photo.c"
}
@@ -13862,14 +13886,14 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
gboolean result = FALSE;
gchar* name = NULL;
gchar* ext = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar** _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar** _tmp6_;
+ gint _tmp6__length1;
#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (basename != NULL, FALSE);
#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13896,7 +13920,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
_g_free0 (name);
#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13898 "Photo.c"
+#line 13922 "Photo.c"
}
#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = ext;
@@ -13910,7 +13934,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
_tmp6_ = extensions;
#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6__length1 = extensions_length1;
-#line 13912 "Photo.c"
+#line 13936 "Photo.c"
{
gchar** extension_collection = NULL;
gint extension_collection_length1 = 0;
@@ -13922,17 +13946,17 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
extension_collection_length1 = _tmp6__length1;
#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) {
-#line 13924 "Photo.c"
- gchar* _tmp7_ = NULL;
+#line 13948 "Photo.c"
+ gchar* _tmp7_;
gchar* extension = NULL;
#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = g_strdup (extension_collection[extension_it]);
#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
extension = _tmp7_;
-#line 13931 "Photo.c"
+#line 13955 "Photo.c"
{
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = ext;
#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13949,11 +13973,11 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
_g_free0 (name);
#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13951 "Photo.c"
+#line 13975 "Photo.c"
}
#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (extension);
-#line 13955 "Photo.c"
+#line 13979 "Photo.c"
}
}
}
@@ -13965,20 +13989,20 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
_g_free0 (name);
#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 13967 "Photo.c"
+#line 13991 "Photo.c"
}
gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) {
gboolean result = FALSE;
- PhotoTable* _tmp0_ = NULL;
- PhotoTable* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- PhotoFileFormat _tmp5_ = 0;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
+ PhotoTable* _tmp0_;
+ PhotoTable* _tmp1_;
+ GFile* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ PhotoFileFormat _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp7_;
#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14003,24 +14027,24 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha
result = _tmp7_;
#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 14005 "Photo.c"
+#line 14029 "Photo.c"
}
PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, int* result_length1) {
PhotoID* result = NULL;
- PhotoTable* _tmp0_ = NULL;
- PhotoTable* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- PhotoFileFormat _tmp5_ = 0;
- gint _tmp6_ = 0;
- PhotoID* _tmp7_ = NULL;
- PhotoID* _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
- PhotoID* _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
+ PhotoTable* _tmp0_;
+ PhotoTable* _tmp1_;
+ GFile* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ PhotoFileFormat _tmp5_;
+ gint _tmp6_;
+ PhotoID* _tmp7_;
+ PhotoID* _tmp8_;
+ gint _tmp8__length1;
+ PhotoID* _tmp9_;
+ gint _tmp9__length1;
#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14051,21 +14075,21 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const
if (result_length1) {
#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
*result_length1 = _tmp9__length1;
-#line 14053 "Photo.c"
+#line 14077 "Photo.c"
}
#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp9_;
#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 14059 "Photo.c"
+#line 14083 "Photo.c"
}
gint64 photo_get_photo_key (DataSource* source) {
gint64 result = 0LL;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
PhotoID _tmp1_ = {0};
- gint64 _tmp2_ = 0LL;
+ gint64 _tmp2_;
#line 1788 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14078,17 +14102,17 @@ gint64 photo_get_photo_key (DataSource* source) {
result = _tmp2_;
#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 14080 "Photo.c"
+#line 14104 "Photo.c"
}
static GFile* photo_real_get_file (MediaSource* base) {
Photo * self;
GFile* result = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
#line 1807 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14105,88 +14129,88 @@ static GFile* photo_real_get_file (MediaSource* base) {
result = _tmp3_;
#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 14107 "Photo.c"
+#line 14131 "Photo.c"
}
-static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) {
#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14118 "Photo.c"
+#line 14142 "Photo.c"
}
#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14124 "Photo.c"
+#line 14148 "Photo.c"
}
-static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) {
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14135 "Photo.c"
+#line 14159 "Photo.c"
}
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14141 "Photo.c"
+#line 14165 "Photo.c"
}
-static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) {
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14152 "Photo.c"
+#line 14176 "Photo.c"
}
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14158 "Photo.c"
+#line 14182 "Photo.c"
}
-static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) {
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14169 "Photo.c"
+#line 14193 "Photo.c"
}
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14175 "Photo.c"
+#line 14199 "Photo.c"
}
void photo_set_master_file (Photo* self, GFile* file) {
gchar* filepath = NULL;
- GFile* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ gchar* _tmp1_;
gboolean altered = FALSE;
gboolean is_baseline = FALSE;
gboolean is_source = FALSE;
gboolean name_changed = FALSE;
GFile* old_file = NULL;
- gboolean _tmp41_ = FALSE;
+ gboolean _tmp41_;
GError * _inner_error_ = NULL;
#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -14208,30 +14232,30 @@ void photo_set_master_file (Photo* self, GFile* file) {
name_changed = FALSE;
#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
old_file = NULL;
-#line 14210 "Photo.c"
+#line 14234 "Photo.c"
{
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14218 "Photo.c"
+#line 14242 "Photo.c"
{
{
- PhotoBackingReaders* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp3_;
#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14226 "Photo.c"
+#line 14250 "Photo.c"
{
- PhotoBackingReaders* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
- GFile* _tmp7_ = NULL;
- GFile* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ PhotoBackingReaders* _tmp4_;
+ PhotoFileReader* _tmp5_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
+ GFile* _tmp8_;
+ gboolean _tmp9_;
#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14250,29 +14274,29 @@ void photo_set_master_file (Photo* self, GFile* file) {
_tmp9_ = g_file_equal (_tmp7_, _tmp8_);
#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp9_) {
-#line 14252 "Photo.c"
- PhotoTable* _tmp10_ = NULL;
- PhotoTable* _tmp11_ = NULL;
+#line 14276 "Photo.c"
+ PhotoTable* _tmp10_;
+ PhotoTable* _tmp11_;
PhotoID _tmp12_ = {0};
- const gchar* _tmp13_ = NULL;
- PhotoRow* _tmp14_ = NULL;
- BackingPhotoRow* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- GFile* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- PhotoBackingReaders* _tmp20_ = NULL;
- PhotoRow* _tmp21_ = NULL;
- BackingPhotoRow* _tmp22_ = NULL;
- PhotoFileFormat _tmp23_ = 0;
- const gchar* _tmp24_ = NULL;
- PhotoFileReader* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
- gboolean _tmp27_ = FALSE;
+ const gchar* _tmp13_;
+ PhotoRow* _tmp14_;
+ BackingPhotoRow* _tmp15_;
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
+ GFile* _tmp18_;
+ gchar* _tmp19_;
+ PhotoBackingReaders* _tmp20_;
+ PhotoRow* _tmp21_;
+ BackingPhotoRow* _tmp22_;
+ PhotoFileFormat _tmp23_;
+ const gchar* _tmp24_;
+ PhotoFileReader* _tmp25_;
+ gboolean _tmp26_;
+ gboolean _tmp27_;
gboolean _tmp28_ = FALSE;
- PhotoRow* _tmp29_ = NULL;
- const gchar* _tmp30_ = NULL;
- gboolean _tmp31_ = FALSE;
+ PhotoRow* _tmp29_;
+ const gchar* _tmp30_;
+ gboolean _tmp31_;
#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = photo_table_get_instance ();
#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14287,8 +14311,8 @@ void photo_set_master_file (Photo* self, GFile* file) {
_database_table_unref0 (_tmp11_);
#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14289 "Photo.c"
- goto __finally313;
+#line 14313 "Photo.c"
+ goto __finally314;
}
#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
@@ -14344,13 +14368,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
_tmp31_ = is_string_empty (_tmp30_);
#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp31_) {
-#line 14346 "Photo.c"
- GFile* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- GFile* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
+#line 14370 "Photo.c"
+ GFile* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ GFile* _tmp35_;
+ gchar* _tmp36_;
+ gchar* _tmp37_;
#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = old_file;
#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14369,48 +14393,48 @@ void photo_set_master_file (Photo* self, GFile* file) {
_g_free0 (_tmp37_);
#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp34_);
-#line 14371 "Photo.c"
+#line 14395 "Photo.c"
} else {
#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = FALSE;
-#line 14375 "Photo.c"
+#line 14399 "Photo.c"
}
#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
name_changed = _tmp28_;
-#line 14379 "Photo.c"
+#line 14403 "Photo.c"
}
}
- __finally313:
+ __finally314:
{
- PhotoBackingReaders* _tmp38_ = NULL;
+ PhotoBackingReaders* _tmp38_;
#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = self->priv->readers;
#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14389 "Photo.c"
+#line 14413 "Photo.c"
}
#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14393 "Photo.c"
- goto __finally312;
+#line 14417 "Photo.c"
+ goto __finally313;
}
}
}
- __finally312:
+ __finally313:
{
- PhotoRow* _tmp39_ = NULL;
+ PhotoRow* _tmp39_;
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = self->row;
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14405 "Photo.c"
+#line 14429 "Photo.c"
}
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14411 "Photo.c"
- goto __catch311_database_error;
+#line 14435 "Photo.c"
+ goto __catch312_database_error;
}
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (old_file);
@@ -14422,15 +14446,15 @@ void photo_set_master_file (Photo* self, GFile* file) {
g_clear_error (&_inner_error_);
#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 14424 "Photo.c"
+#line 14448 "Photo.c"
}
}
}
- goto __finally311;
- __catch311_database_error:
+ goto __finally312;
+ __catch312_database_error:
{
GError* err = NULL;
- GError* _tmp40_ = NULL;
+ GError* _tmp40_;
#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14441,9 +14465,9 @@ void photo_set_master_file (Photo* self, GFile* file) {
app_window_database_error (_tmp40_);
#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 14443 "Photo.c"
+#line 14467 "Photo.c"
}
- __finally311:
+ __finally312:
#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14456,30 +14480,30 @@ void photo_set_master_file (Photo* self, GFile* file) {
g_clear_error (&_inner_error_);
#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 14458 "Photo.c"
+#line 14482 "Photo.c"
}
#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = altered;
#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp41_) {
-#line 14464 "Photo.c"
- GFile* _tmp42_ = NULL;
- GFile* _tmp43_ = NULL;
- gboolean _tmp44_ = FALSE;
+#line 14488 "Photo.c"
+ GFile* _tmp42_;
+ GFile* _tmp43_;
+ gboolean _tmp44_;
gchar** alteration_list = NULL;
- gchar** _tmp45_ = NULL;
- gint alteration_list_length1 = 0;
- gint _alteration_list_size_ = 0;
- gchar** _tmp46_ = NULL;
- gint _tmp46__length1 = 0;
- gchar* _tmp47_ = NULL;
- gboolean _tmp48_ = FALSE;
- gboolean _tmp51_ = FALSE;
- gboolean _tmp54_ = FALSE;
- gchar** _tmp57_ = NULL;
- gint _tmp57__length1 = 0;
- Alteration* _tmp58_ = NULL;
- Alteration* _tmp59_ = NULL;
+ gchar** _tmp45_;
+ gint alteration_list_length1;
+ gint _alteration_list_size_;
+ gchar** _tmp46_;
+ gint _tmp46__length1;
+ gchar* _tmp47_;
+ gboolean _tmp48_;
+ gboolean _tmp51_;
+ gboolean _tmp54_;
+ gchar** _tmp57_;
+ gint _tmp57__length1;
+ Alteration* _tmp58_;
+ Alteration* _tmp59_;
#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = old_file;
#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14492,7 +14516,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
if (_tmp44_) {
#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_baseline_replaced (self);
-#line 14494 "Photo.c"
+#line 14518 "Photo.c"
}
#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = g_new0 (gchar*, 0 + 1);
@@ -14514,10 +14538,10 @@ void photo_set_master_file (Photo* self, GFile* file) {
_tmp48_ = name_changed;
#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp48_) {
-#line 14516 "Photo.c"
- gchar** _tmp49_ = NULL;
- gint _tmp49__length1 = 0;
- gchar* _tmp50_ = NULL;
+#line 14540 "Photo.c"
+ gchar** _tmp49_;
+ gint _tmp49__length1;
+ gchar* _tmp50_;
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = alteration_list;
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14526,16 +14550,16 @@ void photo_set_master_file (Photo* self, GFile* file) {
_tmp50_ = g_strdup ("metadata:name");
#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
-#line 14528 "Photo.c"
+#line 14552 "Photo.c"
}
#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp51_ = is_source;
#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp51_) {
-#line 14534 "Photo.c"
- gchar** _tmp52_ = NULL;
- gint _tmp52__length1 = 0;
- gchar* _tmp53_ = NULL;
+#line 14558 "Photo.c"
+ gchar** _tmp52_;
+ gint _tmp52__length1;
+ gchar* _tmp53_;
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = alteration_list;
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14544,16 +14568,16 @@ void photo_set_master_file (Photo* self, GFile* file) {
_tmp53_ = g_strdup ("backing:source");
#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
-#line 14546 "Photo.c"
+#line 14570 "Photo.c"
}
#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp54_ = is_baseline;
#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp54_) {
-#line 14552 "Photo.c"
- gchar** _tmp55_ = NULL;
- gint _tmp55__length1 = 0;
- gchar* _tmp56_ = NULL;
+#line 14576 "Photo.c"
+ gchar** _tmp55_;
+ gint _tmp55__length1;
+ gchar* _tmp56_;
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = alteration_list;
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14562,7 +14586,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
_tmp56_ = g_strdup ("backing:baseline");
#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
-#line 14564 "Photo.c"
+#line 14588 "Photo.c"
}
#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = alteration_list;
@@ -14578,76 +14602,76 @@ void photo_set_master_file (Photo* self, GFile* file) {
_alteration_unref0 (_tmp59_);
#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14580 "Photo.c"
+#line 14604 "Photo.c"
}
#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (old_file);
#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (filepath);
-#line 14586 "Photo.c"
+#line 14610 "Photo.c"
}
-static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) {
#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14597 "Photo.c"
+#line 14621 "Photo.c"
}
#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14603 "Photo.c"
+#line 14627 "Photo.c"
}
-static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) {
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14614 "Photo.c"
+#line 14638 "Photo.c"
}
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14620 "Photo.c"
+#line 14644 "Photo.c"
}
-static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) {
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14631 "Photo.c"
+#line 14655 "Photo.c"
}
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 14637 "Photo.c"
+#line 14661 "Photo.c"
}
void photo_set_editable_file (Photo* self, GFile* file) {
gchar* filepath = NULL;
- GFile* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ gchar* _tmp1_;
gboolean altered = FALSE;
gboolean is_baseline = FALSE;
gboolean is_source = FALSE;
GFile* old_file = NULL;
- gboolean _tmp34_ = FALSE;
+ gboolean _tmp34_;
GError * _inner_error_ = NULL;
#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -14667,40 +14691,40 @@ void photo_set_editable_file (Photo* self, GFile* file) {
is_source = FALSE;
#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
old_file = NULL;
-#line 14669 "Photo.c"
+#line 14693 "Photo.c"
{
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14677 "Photo.c"
+#line 14701 "Photo.c"
{
{
- PhotoBackingReaders* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp3_;
#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14685 "Photo.c"
+#line 14709 "Photo.c"
{
GFile* _tmp4_ = NULL;
- PhotoBackingReaders* _tmp5_ = NULL;
- PhotoFileReader* _tmp6_ = NULL;
- GFile* _tmp10_ = NULL;
+ PhotoBackingReaders* _tmp5_;
+ PhotoFileReader* _tmp6_;
+ GFile* _tmp10_;
gboolean _tmp11_ = FALSE;
- GFile* _tmp12_ = NULL;
+ GFile* _tmp12_;
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->priv->readers;
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp5_->editable;
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ != NULL) {
-#line 14699 "Photo.c"
- PhotoBackingReaders* _tmp7_ = NULL;
- PhotoFileReader* _tmp8_ = NULL;
- GFile* _tmp9_ = NULL;
+#line 14723 "Photo.c"
+ PhotoBackingReaders* _tmp7_;
+ PhotoFileReader* _tmp8_;
+ GFile* _tmp9_;
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->readers;
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14711,13 +14735,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_g_object_unref0 (_tmp4_);
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp9_;
-#line 14713 "Photo.c"
+#line 14737 "Photo.c"
} else {
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp4_);
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = NULL;
-#line 14719 "Photo.c"
+#line 14743 "Photo.c"
}
#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = _g_object_ref0 (_tmp4_);
@@ -14729,10 +14753,10 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_tmp12_ = old_file;
#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_ != NULL) {
-#line 14731 "Photo.c"
- GFile* _tmp13_ = NULL;
- GFile* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+#line 14755 "Photo.c"
+ GFile* _tmp13_;
+ GFile* _tmp14_;
+ gboolean _tmp15_;
#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = old_file;
#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14741,30 +14765,30 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = !_tmp15_;
-#line 14743 "Photo.c"
+#line 14767 "Photo.c"
} else {
#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = FALSE;
-#line 14747 "Photo.c"
+#line 14771 "Photo.c"
}
#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 14751 "Photo.c"
- BackingPhotoTable* _tmp16_ = NULL;
- BackingPhotoTable* _tmp17_ = NULL;
- PhotoRow* _tmp18_ = NULL;
- BackingPhotoID _tmp19_ = {0};
- const gchar* _tmp20_ = NULL;
- BackingPhotoRow* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- PhotoBackingReaders* _tmp24_ = NULL;
- BackingPhotoRow* _tmp25_ = NULL;
- PhotoFileFormat _tmp26_ = 0;
- const gchar* _tmp27_ = NULL;
- PhotoFileReader* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
- gboolean _tmp30_ = FALSE;
+#line 14775 "Photo.c"
+ BackingPhotoTable* _tmp16_;
+ BackingPhotoTable* _tmp17_;
+ PhotoRow* _tmp18_;
+ BackingPhotoID _tmp19_;
+ const gchar* _tmp20_;
+ BackingPhotoRow* _tmp21_;
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
+ PhotoBackingReaders* _tmp24_;
+ BackingPhotoRow* _tmp25_;
+ PhotoFileFormat _tmp26_;
+ const gchar* _tmp27_;
+ PhotoFileReader* _tmp28_;
+ gboolean _tmp29_;
+ gboolean _tmp30_;
#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = backing_photo_table_get_instance ();
#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14783,8 +14807,8 @@ void photo_set_editable_file (Photo* self, GFile* file) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp4_);
-#line 14785 "Photo.c"
- goto __finally316;
+#line 14809 "Photo.c"
+ goto __finally317;
}
#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = self->priv->editable;
@@ -14820,43 +14844,43 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_tmp30_ = photo_is_editable_source (self);
#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
is_source = _tmp30_;
-#line 14822 "Photo.c"
+#line 14846 "Photo.c"
}
#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp4_);
-#line 14826 "Photo.c"
+#line 14850 "Photo.c"
}
- __finally316:
+ __finally317:
{
- PhotoBackingReaders* _tmp31_ = NULL;
+ PhotoBackingReaders* _tmp31_;
#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = self->priv->readers;
#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14835 "Photo.c"
+#line 14859 "Photo.c"
}
#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14839 "Photo.c"
- goto __finally315;
+#line 14863 "Photo.c"
+ goto __finally316;
}
}
}
- __finally315:
+ __finally316:
{
- PhotoRow* _tmp32_ = NULL;
+ PhotoRow* _tmp32_;
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = self->row;
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14851 "Photo.c"
+#line 14875 "Photo.c"
}
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14857 "Photo.c"
- goto __catch314_database_error;
+#line 14881 "Photo.c"
+ goto __catch315_database_error;
}
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (old_file);
@@ -14868,15 +14892,15 @@ void photo_set_editable_file (Photo* self, GFile* file) {
g_clear_error (&_inner_error_);
#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 14870 "Photo.c"
+#line 14894 "Photo.c"
}
}
}
- goto __finally314;
- __catch314_database_error:
+ goto __finally315;
+ __catch315_database_error:
{
GError* err = NULL;
- GError* _tmp33_ = NULL;
+ GError* _tmp33_;
#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14887,9 +14911,9 @@ void photo_set_editable_file (Photo* self, GFile* file) {
app_window_database_error (_tmp33_);
#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 14889 "Photo.c"
+#line 14913 "Photo.c"
}
- __finally314:
+ __finally315:
#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14902,29 +14926,29 @@ void photo_set_editable_file (Photo* self, GFile* file) {
g_clear_error (&_inner_error_);
#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 14904 "Photo.c"
+#line 14928 "Photo.c"
}
#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = altered;
#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp34_) {
-#line 14910 "Photo.c"
- GFile* _tmp35_ = NULL;
- GFile* _tmp36_ = NULL;
- gboolean _tmp37_ = FALSE;
+#line 14934 "Photo.c"
+ GFile* _tmp35_;
+ GFile* _tmp36_;
+ gboolean _tmp37_;
gchar** alteration_list = NULL;
- gchar** _tmp38_ = NULL;
- gint alteration_list_length1 = 0;
- gint _alteration_list_size_ = 0;
- gchar** _tmp39_ = NULL;
- gint _tmp39__length1 = 0;
- gchar* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
- gboolean _tmp44_ = FALSE;
- gchar** _tmp47_ = NULL;
- gint _tmp47__length1 = 0;
- Alteration* _tmp48_ = NULL;
- Alteration* _tmp49_ = NULL;
+ gchar** _tmp38_;
+ gint alteration_list_length1;
+ gint _alteration_list_size_;
+ gchar** _tmp39_;
+ gint _tmp39__length1;
+ gchar* _tmp40_;
+ gboolean _tmp41_;
+ gboolean _tmp44_;
+ gchar** _tmp47_;
+ gint _tmp47__length1;
+ Alteration* _tmp48_;
+ Alteration* _tmp49_;
#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = old_file;
#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14937,7 +14961,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
if (_tmp37_) {
#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_baseline_replaced (self);
-#line 14939 "Photo.c"
+#line 14963 "Photo.c"
}
#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = g_new0 (gchar*, 0 + 1);
@@ -14959,10 +14983,10 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_tmp41_ = is_baseline;
#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp41_) {
-#line 14961 "Photo.c"
- gchar** _tmp42_ = NULL;
- gint _tmp42__length1 = 0;
- gchar* _tmp43_ = NULL;
+#line 14985 "Photo.c"
+ gchar** _tmp42_;
+ gint _tmp42__length1;
+ gchar* _tmp43_;
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = alteration_list;
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14971,16 +14995,16 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_tmp43_ = g_strdup ("backing:baseline");
#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
-#line 14973 "Photo.c"
+#line 14997 "Photo.c"
}
#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp44_ = is_source;
#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp44_) {
-#line 14979 "Photo.c"
- gchar** _tmp45_ = NULL;
- gint _tmp45__length1 = 0;
- gchar* _tmp46_ = NULL;
+#line 15003 "Photo.c"
+ gchar** _tmp45_;
+ gint _tmp45__length1;
+ gchar* _tmp46_;
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = alteration_list;
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14989,7 +15013,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_tmp46_ = g_strdup ("backing:source");
#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
-#line 14991 "Photo.c"
+#line 15015 "Photo.c"
}
#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = alteration_list;
@@ -15005,20 +15029,20 @@ void photo_set_editable_file (Photo* self, GFile* file) {
_alteration_unref0 (_tmp49_);
#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 15007 "Photo.c"
+#line 15031 "Photo.c"
}
#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (old_file);
#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (filepath);
-#line 15013 "Photo.c"
+#line 15037 "Photo.c"
}
void photo_set_many_editable_file (GeeMap* map, GError** error) {
GeeMapIterator* map_iter = NULL;
- GeeMap* _tmp0_ = NULL;
- GeeMapIterator* _tmp1_ = NULL;
+ GeeMap* _tmp0_;
+ GeeMapIterator* _tmp1_;
GError * _inner_error_ = NULL;
#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (GEE_IS_MAP (map));
@@ -15032,15 +15056,15 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
map_iter = _tmp1_;
#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 15034 "Photo.c"
- GeeMapIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- GeeMapIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- GeeMapIterator* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- GFile* _tmp9_ = NULL;
+#line 15058 "Photo.c"
+ GeeMapIterator* _tmp2_;
+ gboolean _tmp3_;
+ GeeMapIterator* _tmp4_;
+ gpointer _tmp5_;
+ Photo* _tmp6_;
+ GeeMapIterator* _tmp7_;
+ gpointer _tmp8_;
+ GFile* _tmp9_;
#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = map_iter;
#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15049,7 +15073,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
if (!_tmp3_) {
#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 15051 "Photo.c"
+#line 15075 "Photo.c"
}
#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = map_iter;
@@ -15069,7 +15093,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
_g_object_unref0 (_tmp9_);
#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp6_);
-#line 15071 "Photo.c"
+#line 15095 "Photo.c"
}
#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
database_table_commit_transaction (&_inner_error_);
@@ -15083,7 +15107,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
_g_object_unref0 (map_iter);
#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15085 "Photo.c"
+#line 15109 "Photo.c"
} else {
#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (map_iter);
@@ -15093,21 +15117,21 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
g_clear_error (&_inner_error_);
#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15095 "Photo.c"
+#line 15119 "Photo.c"
}
}
#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (map_iter);
-#line 15100 "Photo.c"
+#line 15124 "Photo.c"
}
GFile* photo_get_actual_file (Photo* self) {
GFile* result = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15124,17 +15148,17 @@ GFile* photo_get_actual_file (Photo* self) {
result = _tmp3_;
#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15126 "Photo.c"
+#line 15150 "Photo.c"
}
static GFile* photo_real_get_master_file (MediaSource* base) {
Photo * self;
GFile* result = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
#line 1933 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15151,16 +15175,16 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
result = _tmp3_;
#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15153 "Photo.c"
+#line 15177 "Photo.c"
}
GFile* photo_get_editable_file (Photo* self) {
GFile* result = NULL;
PhotoFileReader* reader = NULL;
- PhotoFileReader* _tmp0_ = NULL;
+ PhotoFileReader* _tmp0_;
GFile* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoFileReader* _tmp2_;
#line 1937 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15171,9 +15195,9 @@ GFile* photo_get_editable_file (Photo* self) {
_tmp2_ = reader;
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 15173 "Photo.c"
- PhotoFileReader* _tmp3_ = NULL;
- GFile* _tmp4_ = NULL;
+#line 15197 "Photo.c"
+ PhotoFileReader* _tmp3_;
+ GFile* _tmp4_;
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = reader;
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15182,13 +15206,13 @@ GFile* photo_get_editable_file (Photo* self) {
_g_object_unref0 (_tmp1_);
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp4_;
-#line 15184 "Photo.c"
+#line 15208 "Photo.c"
} else {
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp1_);
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = NULL;
-#line 15190 "Photo.c"
+#line 15214 "Photo.c"
}
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
@@ -15196,15 +15220,15 @@ GFile* photo_get_editable_file (Photo* self) {
_photo_file_adapter_unref0 (reader);
#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15198 "Photo.c"
+#line 15222 "Photo.c"
}
GeeCollection* photo_get_raw_developer_files (Photo* self) {
GeeCollection* result = NULL;
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
GeeArrayList* ret = NULL;
- GeeArrayList* _tmp1_ = NULL;
+ GeeArrayList* _tmp1_;
GError * _inner_error_ = NULL;
#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -15216,29 +15240,29 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
result = NULL;
#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15218 "Photo.c"
+#line 15242 "Photo.c"
}
#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
ret = _tmp1_;
-#line 15224 "Photo.c"
+#line 15248 "Photo.c"
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15231 "Photo.c"
+#line 15255 "Photo.c"
{
{
GeeIterator* _row_it = NULL;
- GeeHashMap* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeCollection* _tmp5_ = NULL;
- GeeCollection* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
- GeeIterator* _tmp8_ = NULL;
+ GeeHashMap* _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeCollection* _tmp5_;
+ GeeCollection* _tmp6_;
+ GeeIterator* _tmp7_;
+ GeeIterator* _tmp8_;
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->developments;
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15257,17 +15281,17 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
_row_it = _tmp8_;
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 15259 "Photo.c"
- GeeIterator* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+#line 15283 "Photo.c"
+ GeeIterator* _tmp9_;
+ gboolean _tmp10_;
BackingPhotoRow* row = NULL;
- GeeIterator* _tmp11_ = NULL;
- gpointer _tmp12_ = NULL;
- GeeArrayList* _tmp13_ = NULL;
- BackingPhotoRow* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- GFile* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
+ GeeIterator* _tmp11_;
+ gpointer _tmp12_;
+ GeeArrayList* _tmp13_;
+ BackingPhotoRow* _tmp14_;
+ const gchar* _tmp15_;
+ GFile* _tmp16_;
+ GFile* _tmp17_;
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = _row_it;
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15276,7 +15300,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
if (!_tmp10_) {
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 15278 "Photo.c"
+#line 15302 "Photo.c"
}
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _row_it;
@@ -15300,21 +15324,21 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
_g_object_unref0 (_tmp17_);
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (row);
-#line 15302 "Photo.c"
+#line 15326 "Photo.c"
}
#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_row_it);
-#line 15306 "Photo.c"
+#line 15330 "Photo.c"
}
}
- __finally317:
+ __finally318:
{
- PhotoRow* _tmp18_ = NULL;
+ PhotoRow* _tmp18_;
#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = self->row;
#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15316 "Photo.c"
+#line 15340 "Photo.c"
}
#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -15326,23 +15350,23 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
g_clear_error (&_inner_error_);
#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 15328 "Photo.c"
+#line 15352 "Photo.c"
}
}
#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection);
#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15335 "Photo.c"
+#line 15359 "Photo.c"
}
GFile* photo_get_source_file (Photo* self) {
GFile* result = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
#line 1956 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15359,7 +15383,7 @@ GFile* photo_get_source_file (Photo* self) {
result = _tmp3_;
#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15361 "Photo.c"
+#line 15385 "Photo.c"
}
@@ -15368,44 +15392,44 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
GError * _inner_error_ = NULL;
#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15370 "Photo.c"
+#line 15394 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15377 "Photo.c"
+#line 15401 "Photo.c"
{
- BackingPhotoRow* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
+ BackingPhotoRow* _tmp1_;
+ PhotoFileFormat _tmp2_;
#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->backing_photo_row;
#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->file_format;
#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 15387 "Photo.c"
+#line 15411 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15394 "Photo.c"
+#line 15418 "Photo.c"
}
#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15398 "Photo.c"
+#line 15422 "Photo.c"
}
- __finally318:
+ __finally319:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15407 "Photo.c"
+#line 15431 "Photo.c"
}
#line 1961 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15413,7 +15437,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
g_clear_error (&_inner_error_);
#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 15415 "Photo.c"
+#line 15439 "Photo.c"
}
}
@@ -15421,9 +15445,9 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
PhotoFileFormat result = 0;
PhotoFileFormat file_format = 0;
- PhotoFileFormat _tmp0_ = 0;
- PhotoFileFormat _tmp1_ = 0;
- gboolean _tmp2_ = FALSE;
+ PhotoFileFormat _tmp0_;
+ PhotoFileFormat _tmp1_;
+ gboolean _tmp2_;
#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15436,19 +15460,19 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
_tmp2_ = photo_file_format_can_write (_tmp1_);
#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp2_) {
-#line 15438 "Photo.c"
- PhotoFileFormat _tmp3_ = 0;
+#line 15462 "Photo.c"
+ PhotoFileFormat _tmp3_;
#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = photo_file_format_get_system_default_format ();
#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
file_format = _tmp3_;
-#line 15444 "Photo.c"
+#line 15468 "Photo.c"
}
#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
result = file_format;
#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15450 "Photo.c"
+#line 15474 "Photo.c"
}
@@ -15457,18 +15481,18 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
GError * _inner_error_ = NULL;
#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15459 "Photo.c"
+#line 15483 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15466 "Photo.c"
+#line 15490 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoFileFormat _tmp3_;
#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15477,27 +15501,27 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 15479 "Photo.c"
+#line 15503 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15486 "Photo.c"
+#line 15510 "Photo.c"
}
#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15490 "Photo.c"
+#line 15514 "Photo.c"
}
- __finally319:
+ __finally320:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15499 "Photo.c"
+#line 15523 "Photo.c"
}
#line 1975 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15505,7 +15529,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
g_clear_error (&_inner_error_);
#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 15507 "Photo.c"
+#line 15531 "Photo.c"
}
}
@@ -15516,45 +15540,45 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15518 "Photo.c"
+#line 15542 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
time_t _tmp5_ = 0;
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15526 "Photo.c"
+#line 15550 "Photo.c"
{
- BackingPhotoRow* _tmp1_ = NULL;
- time_t _tmp2_ = 0;
+ BackingPhotoRow* _tmp1_;
+ time_t _tmp2_;
#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->backing_photo_row;
#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->timestamp;
#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 15536 "Photo.c"
+#line 15560 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15543 "Photo.c"
+#line 15567 "Photo.c"
}
#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15547 "Photo.c"
+#line 15571 "Photo.c"
}
- __finally320:
+ __finally321:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15556 "Photo.c"
+#line 15580 "Photo.c"
}
#line 1981 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15562,7 +15586,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 15564 "Photo.c"
+#line 15588 "Photo.c"
}
}
@@ -15571,44 +15595,44 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
GError * _inner_error_ = NULL;
#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
-#line 15573 "Photo.c"
+#line 15597 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15580 "Photo.c"
+#line 15604 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- PhotoID _tmp2_ = {0};
+ PhotoRow* _tmp1_;
+ PhotoID _tmp2_;
#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->photo_id;
#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
*result = _tmp2_;
-#line 15590 "Photo.c"
+#line 15614 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15597 "Photo.c"
+#line 15621 "Photo.c"
}
#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15601 "Photo.c"
+#line 15625 "Photo.c"
}
- __finally321:
+ __finally322:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15610 "Photo.c"
+#line 15634 "Photo.c"
}
#line 1987 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15616,15 +15640,15 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
g_clear_error (&_inner_error_);
#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15618 "Photo.c"
+#line 15642 "Photo.c"
}
}
static inline void photo_real_get_event_id (MediaSource* base, EventID* result) {
Photo * self;
- PhotoRow* _tmp0_ = NULL;
- EventID _tmp1_ = {0};
+ PhotoRow* _tmp0_;
+ EventID _tmp1_;
#line 1993 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15635,15 +15659,15 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result)
*result = _tmp1_;
#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15637 "Photo.c"
+#line 15661 "Photo.c"
}
inline gint64 photo_get_raw_event_id (Photo* self) {
gint64 result = 0LL;
- PhotoRow* _tmp0_ = NULL;
- EventID _tmp1_ = {0};
- gint64 _tmp2_ = 0LL;
+ PhotoRow* _tmp0_;
+ EventID _tmp1_;
+ gint64 _tmp2_;
#line 1998 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0LL);
#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15656,7 +15680,7 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
result = _tmp2_;
#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15658 "Photo.c"
+#line 15682 "Photo.c"
}
@@ -15665,44 +15689,44 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
GError * _inner_error_ = NULL;
#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15667 "Photo.c"
+#line 15691 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15674 "Photo.c"
+#line 15698 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- ImportID _tmp2_ = {0};
+ PhotoRow* _tmp1_;
+ ImportID _tmp2_;
#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->import_id;
#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
*result = _tmp2_;
-#line 15684 "Photo.c"
+#line 15708 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15691 "Photo.c"
+#line 15715 "Photo.c"
}
#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15695 "Photo.c"
+#line 15719 "Photo.c"
}
- __finally322:
+ __finally323:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15704 "Photo.c"
+#line 15728 "Photo.c"
}
#line 2003 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15710,7 +15734,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
g_clear_error (&_inner_error_);
#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15712 "Photo.c"
+#line 15736 "Photo.c"
}
}
@@ -15719,44 +15743,44 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
GError * _inner_error_ = NULL;
#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
-#line 15721 "Photo.c"
+#line 15745 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15728 "Photo.c"
+#line 15752 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- BackingPhotoID _tmp2_ = {0};
+ PhotoRow* _tmp1_;
+ BackingPhotoID _tmp2_;
#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable_id;
#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
*result = _tmp2_;
-#line 15738 "Photo.c"
+#line 15762 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15745 "Photo.c"
+#line 15769 "Photo.c"
}
#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15749 "Photo.c"
+#line 15773 "Photo.c"
}
- __finally323:
+ __finally324:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15758 "Photo.c"
+#line 15782 "Photo.c"
}
#line 2009 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15764,7 +15788,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
g_clear_error (&_inner_error_);
#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 15766 "Photo.c"
+#line 15790 "Photo.c"
}
}
@@ -15775,18 +15799,18 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15777 "Photo.c"
+#line 15801 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15784 "Photo.c"
+#line 15808 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ PhotoRow* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15795,27 +15819,27 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
_tmp3_ = g_strdup (_tmp2_);
#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 15797 "Photo.c"
+#line 15821 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15804 "Photo.c"
+#line 15828 "Photo.c"
}
#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15808 "Photo.c"
+#line 15832 "Photo.c"
}
- __finally324:
+ __finally325:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15817 "Photo.c"
+#line 15841 "Photo.c"
}
#line 2015 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15823,7 +15847,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 15825 "Photo.c"
+#line 15849 "Photo.c"
}
}
@@ -15833,45 +15857,45 @@ guint64 photo_get_flags (Photo* self) {
GError * _inner_error_ = NULL;
#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 15835 "Photo.c"
+#line 15859 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
guint64 _tmp5_ = 0ULL;
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15843 "Photo.c"
+#line 15867 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
+ PhotoRow* _tmp1_;
+ guint64 _tmp2_;
#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->flags;
#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 15853 "Photo.c"
+#line 15877 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15860 "Photo.c"
+#line 15884 "Photo.c"
}
#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 15864 "Photo.c"
+#line 15888 "Photo.c"
}
- __finally325:
+ __finally326:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15873 "Photo.c"
+#line 15897 "Photo.c"
}
#line 2023 "/home/jens/Source/shotwell/src/Photo.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);
@@ -15879,16 +15903,16 @@ guint64 photo_get_flags (Photo* self) {
g_clear_error (&_inner_error_);
#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 15881 "Photo.c"
+#line 15905 "Photo.c"
}
}
static void photo_notify_flags_altered (Photo* self, Alteration* additional_alteration) {
Alteration* alteration = NULL;
- Alteration* _tmp0_ = NULL;
- Alteration* _tmp1_ = NULL;
- Alteration* _tmp5_ = NULL;
+ Alteration* _tmp0_;
+ Alteration* _tmp1_;
+ Alteration* _tmp5_;
#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15901,10 +15925,10 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
_tmp1_ = additional_alteration;
#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ != NULL) {
-#line 15903 "Photo.c"
- Alteration* _tmp2_ = NULL;
- Alteration* _tmp3_ = NULL;
- Alteration* _tmp4_ = NULL;
+#line 15927 "Photo.c"
+ Alteration* _tmp2_;
+ Alteration* _tmp3_;
+ Alteration* _tmp4_;
#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = alteration;
#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15915,7 +15939,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
_alteration_unref0 (alteration);
#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
alteration = _tmp4_;
-#line 15917 "Photo.c"
+#line 15941 "Photo.c"
}
#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = alteration;
@@ -15923,35 +15947,35 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (alteration);
-#line 15925 "Photo.c"
+#line 15949 "Photo.c"
}
guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration) {
guint64 result = 0ULL;
gboolean committed = FALSE;
- gboolean _tmp11_ = FALSE;
- guint64 _tmp13_ = 0ULL;
+ gboolean _tmp11_;
+ guint64 _tmp13_;
GError * _inner_error_ = NULL;
#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 15939 "Photo.c"
+#line 15963 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15946 "Photo.c"
+#line 15970 "Photo.c"
{
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
PhotoID _tmp3_ = {0};
- guint64 _tmp4_ = 0ULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ guint64 _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_table_get_instance ();
#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15970,30 +15994,30 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
_tmp6_ = committed;
#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_) {
-#line 15972 "Photo.c"
- PhotoRow* _tmp7_ = NULL;
- guint64 _tmp8_ = 0ULL;
+#line 15996 "Photo.c"
+ PhotoRow* _tmp7_;
+ guint64 _tmp8_;
#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->row;
#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = flags;
#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_->flags = _tmp8_;
-#line 15981 "Photo.c"
+#line 16005 "Photo.c"
}
}
- __finally326:
+ __finally327:
{
- PhotoRow* _tmp9_ = NULL;
+ PhotoRow* _tmp9_;
#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15991 "Photo.c"
+#line 16015 "Photo.c"
}
#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15995 "Photo.c"
+#line 16019 "Photo.c"
guint64 _tmp10_ = 0ULL;
#line 2038 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16001,20 +16025,20 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
g_clear_error (&_inner_error_);
#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp10_;
-#line 16003 "Photo.c"
+#line 16027 "Photo.c"
}
}
#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = committed;
#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 16010 "Photo.c"
- Alteration* _tmp12_ = NULL;
+#line 16034 "Photo.c"
+ Alteration* _tmp12_;
#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = additional_alteration;
#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_flags_altered (self, _tmp12_);
-#line 16016 "Photo.c"
+#line 16040 "Photo.c"
}
#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = flags;
@@ -16022,7 +16046,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
result = _tmp13_;
#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16024 "Photo.c"
+#line 16048 "Photo.c"
}
@@ -16031,20 +16055,20 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
GError * _inner_error_ = NULL;
#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16033 "Photo.c"
+#line 16057 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp7_ = FALSE;
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16041 "Photo.c"
+#line 16065 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
- gboolean _tmp4_ = FALSE;
+ PhotoRow* _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
+ gboolean _tmp4_;
#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16055,27 +16079,27 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp4_;
-#line 16057 "Photo.c"
+#line 16081 "Photo.c"
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16064 "Photo.c"
+#line 16088 "Photo.c"
}
#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16068 "Photo.c"
+#line 16092 "Photo.c"
}
- __finally327:
+ __finally328:
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16077 "Photo.c"
+#line 16101 "Photo.c"
}
#line 2051 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16083,7 +16107,7 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
g_clear_error (&_inner_error_);
#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp7_;
-#line 16085 "Photo.c"
+#line 16109 "Photo.c"
}
}
@@ -16092,7 +16116,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
guint64 result = 0ULL;
guint64 flags = 0ULL;
gboolean committed = FALSE;
- gboolean _tmp18_ = FALSE;
+ gboolean _tmp18_;
GError * _inner_error_ = NULL;
#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16102,22 +16126,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
flags = (guint64) 0;
#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 16104 "Photo.c"
+#line 16128 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16111 "Photo.c"
- {
- PhotoRow* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
- guint64 _tmp4_ = 0ULL;
- PhotoRow* _tmp5_ = NULL;
- guint64 _tmp6_ = 0ULL;
- guint64 _tmp7_ = 0ULL;
+#line 16135 "Photo.c"
+ {
+ PhotoRow* _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
+ guint64 _tmp4_;
+ PhotoRow* _tmp5_;
+ guint64 _tmp6_;
+ guint64 _tmp7_;
#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16136,13 +16160,13 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
_tmp7_ = flags;
#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ != _tmp7_) {
-#line 16138 "Photo.c"
- PhotoTable* _tmp8_ = NULL;
- PhotoTable* _tmp9_ = NULL;
+#line 16162 "Photo.c"
+ PhotoTable* _tmp8_;
+ PhotoTable* _tmp9_;
PhotoID _tmp10_ = {0};
- guint64 _tmp11_ = 0ULL;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
+ guint64 _tmp11_;
+ gboolean _tmp12_;
+ gboolean _tmp13_;
#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_table_get_instance ();
#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16161,31 +16185,31 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
_tmp13_ = committed;
#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
-#line 16163 "Photo.c"
- PhotoRow* _tmp14_ = NULL;
- guint64 _tmp15_ = 0ULL;
+#line 16187 "Photo.c"
+ PhotoRow* _tmp14_;
+ guint64 _tmp15_;
#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = flags;
#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_->flags = _tmp15_;
-#line 16172 "Photo.c"
+#line 16196 "Photo.c"
}
}
}
- __finally328:
+ __finally329:
{
- PhotoRow* _tmp16_ = NULL;
+ PhotoRow* _tmp16_;
#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->row;
#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16183 "Photo.c"
+#line 16207 "Photo.c"
}
#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16187 "Photo.c"
+#line 16211 "Photo.c"
guint64 _tmp17_ = 0ULL;
#line 2060 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16193,26 +16217,26 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
g_clear_error (&_inner_error_);
#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp17_;
-#line 16195 "Photo.c"
+#line 16219 "Photo.c"
}
}
#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = committed;
#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_) {
-#line 16202 "Photo.c"
- Alteration* _tmp19_ = NULL;
+#line 16226 "Photo.c"
+ Alteration* _tmp19_;
#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = additional_alteration;
#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_flags_altered (self, _tmp19_);
-#line 16208 "Photo.c"
+#line 16232 "Photo.c"
}
#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
result = flags;
#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16214 "Photo.c"
+#line 16238 "Photo.c"
}
@@ -16220,7 +16244,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
guint64 result = 0ULL;
guint64 flags = 0ULL;
gboolean committed = FALSE;
- gboolean _tmp18_ = FALSE;
+ gboolean _tmp18_;
GError * _inner_error_ = NULL;
#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16230,22 +16254,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
flags = (guint64) 0;
#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 16232 "Photo.c"
+#line 16256 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16239 "Photo.c"
- {
- PhotoRow* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
- guint64 _tmp4_ = 0ULL;
- PhotoRow* _tmp5_ = NULL;
- guint64 _tmp6_ = 0ULL;
- guint64 _tmp7_ = 0ULL;
+#line 16263 "Photo.c"
+ {
+ PhotoRow* _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
+ guint64 _tmp4_;
+ PhotoRow* _tmp5_;
+ guint64 _tmp6_;
+ guint64 _tmp7_;
#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16264,13 +16288,13 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
_tmp7_ = flags;
#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ != _tmp7_) {
-#line 16266 "Photo.c"
- PhotoTable* _tmp8_ = NULL;
- PhotoTable* _tmp9_ = NULL;
+#line 16290 "Photo.c"
+ PhotoTable* _tmp8_;
+ PhotoTable* _tmp9_;
PhotoID _tmp10_ = {0};
- guint64 _tmp11_ = 0ULL;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
+ guint64 _tmp11_;
+ gboolean _tmp12_;
+ gboolean _tmp13_;
#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_table_get_instance ();
#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16289,31 +16313,31 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
_tmp13_ = committed;
#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
-#line 16291 "Photo.c"
- PhotoRow* _tmp14_ = NULL;
- guint64 _tmp15_ = 0ULL;
+#line 16315 "Photo.c"
+ PhotoRow* _tmp14_;
+ guint64 _tmp15_;
#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = flags;
#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_->flags = _tmp15_;
-#line 16300 "Photo.c"
+#line 16324 "Photo.c"
}
}
}
- __finally329:
+ __finally330:
{
- PhotoRow* _tmp16_ = NULL;
+ PhotoRow* _tmp16_;
#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->row;
#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16311 "Photo.c"
+#line 16335 "Photo.c"
}
#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16315 "Photo.c"
+#line 16339 "Photo.c"
guint64 _tmp17_ = 0ULL;
#line 2079 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16321,26 +16345,26 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
g_clear_error (&_inner_error_);
#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp17_;
-#line 16323 "Photo.c"
+#line 16347 "Photo.c"
}
}
#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = committed;
#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_) {
-#line 16330 "Photo.c"
- Alteration* _tmp19_ = NULL;
+#line 16354 "Photo.c"
+ Alteration* _tmp19_;
#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = additional_alteration;
#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_flags_altered (self, _tmp19_);
-#line 16336 "Photo.c"
+#line 16360 "Photo.c"
}
#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
result = flags;
#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16342 "Photo.c"
+#line 16366 "Photo.c"
}
@@ -16348,7 +16372,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
guint64 result = 0ULL;
guint64 flags = 0ULL;
gboolean committed = FALSE;
- gboolean _tmp18_ = FALSE;
+ gboolean _tmp18_;
GError * _inner_error_ = NULL;
#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16358,22 +16382,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
flags = (guint64) 0;
#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 16360 "Photo.c"
+#line 16384 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16367 "Photo.c"
- {
- PhotoRow* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
- guint64 _tmp4_ = 0ULL;
- PhotoRow* _tmp5_ = NULL;
- guint64 _tmp6_ = 0ULL;
- guint64 _tmp7_ = 0ULL;
+#line 16391 "Photo.c"
+ {
+ PhotoRow* _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
+ guint64 _tmp4_;
+ PhotoRow* _tmp5_;
+ guint64 _tmp6_;
+ guint64 _tmp7_;
#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16392,13 +16416,13 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
_tmp7_ = flags;
#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ != _tmp7_) {
-#line 16394 "Photo.c"
- PhotoTable* _tmp8_ = NULL;
- PhotoTable* _tmp9_ = NULL;
+#line 16418 "Photo.c"
+ PhotoTable* _tmp8_;
+ PhotoTable* _tmp9_;
PhotoID _tmp10_ = {0};
- guint64 _tmp11_ = 0ULL;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
+ guint64 _tmp11_;
+ gboolean _tmp12_;
+ gboolean _tmp13_;
#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_table_get_instance ();
#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16417,31 +16441,31 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
_tmp13_ = committed;
#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
-#line 16419 "Photo.c"
- PhotoRow* _tmp14_ = NULL;
- guint64 _tmp15_ = 0ULL;
+#line 16443 "Photo.c"
+ PhotoRow* _tmp14_;
+ guint64 _tmp15_;
#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = flags;
#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_->flags = _tmp15_;
-#line 16428 "Photo.c"
+#line 16452 "Photo.c"
}
}
}
- __finally330:
+ __finally331:
{
- PhotoRow* _tmp16_ = NULL;
+ PhotoRow* _tmp16_;
#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = self->row;
#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16439 "Photo.c"
+#line 16463 "Photo.c"
}
#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16443 "Photo.c"
+#line 16467 "Photo.c"
guint64 _tmp17_ = 0ULL;
#line 2098 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16449,32 +16473,32 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
g_clear_error (&_inner_error_);
#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp17_;
-#line 16451 "Photo.c"
+#line 16475 "Photo.c"
}
}
#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = committed;
#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_) {
-#line 16458 "Photo.c"
- Alteration* _tmp19_ = NULL;
+#line 16482 "Photo.c"
+ Alteration* _tmp19_;
#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = additional_alteration;
#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_flags_altered (self, _tmp19_);
-#line 16464 "Photo.c"
+#line 16488 "Photo.c"
}
#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
result = flags;
#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16470 "Photo.c"
+#line 16494 "Photo.c"
}
void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alteration* additional_add_alteration, GeeCollection* remove, guint64 remove_mask, Alteration* additional_remove_alteration, GError** error) {
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp10_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp10_;
GError * _inner_error_ = NULL;
#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add));
@@ -16490,11 +16514,11 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
_tmp0_ = add;
#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ != NULL) {
-#line 16492 "Photo.c"
+#line 16516 "Photo.c"
{
GeeIterator* _photo_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = add;
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16503,15 +16527,15 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
_photo_it = _tmp2_;
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 16505 "Photo.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 16529 "Photo.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
Photo* photo = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- guint64 _tmp8_ = 0ULL;
- Alteration* _tmp9_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ Photo* _tmp7_;
+ guint64 _tmp8_;
+ Alteration* _tmp9_;
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _photo_it;
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16520,7 +16544,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
if (!_tmp4_) {
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 16522 "Photo.c"
+#line 16546 "Photo.c"
}
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _photo_it;
@@ -16538,22 +16562,22 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
photo_add_flags (_tmp7_, _tmp8_, _tmp9_);
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 16540 "Photo.c"
+#line 16564 "Photo.c"
}
#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_photo_it);
-#line 16544 "Photo.c"
+#line 16568 "Photo.c"
}
}
#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = remove;
#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp10_ != NULL) {
-#line 16551 "Photo.c"
+#line 16575 "Photo.c"
{
GeeIterator* _photo_it = NULL;
- GeeCollection* _tmp11_ = NULL;
- GeeIterator* _tmp12_ = NULL;
+ GeeCollection* _tmp11_;
+ GeeIterator* _tmp12_;
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = remove;
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16562,15 +16586,15 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
_photo_it = _tmp12_;
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 16564 "Photo.c"
- GeeIterator* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+#line 16588 "Photo.c"
+ GeeIterator* _tmp13_;
+ gboolean _tmp14_;
Photo* photo = NULL;
- GeeIterator* _tmp15_ = NULL;
- gpointer _tmp16_ = NULL;
- Photo* _tmp17_ = NULL;
- guint64 _tmp18_ = 0ULL;
- Alteration* _tmp19_ = NULL;
+ GeeIterator* _tmp15_;
+ gpointer _tmp16_;
+ Photo* _tmp17_;
+ guint64 _tmp18_;
+ Alteration* _tmp19_;
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _photo_it;
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16579,7 +16603,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
if (!_tmp14_) {
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 16581 "Photo.c"
+#line 16605 "Photo.c"
}
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = _photo_it;
@@ -16597,11 +16621,11 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
photo_remove_flags (_tmp17_, _tmp18_, _tmp19_);
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 16599 "Photo.c"
+#line 16623 "Photo.c"
}
#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_photo_it);
-#line 16603 "Photo.c"
+#line 16627 "Photo.c"
}
}
#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16614,7 +16638,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
g_propagate_error (error, _inner_error_);
#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 16616 "Photo.c"
+#line 16640 "Photo.c"
} else {
#line 2128 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16622,7 +16646,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
g_clear_error (&_inner_error_);
#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 16624 "Photo.c"
+#line 16648 "Photo.c"
}
}
}
@@ -16632,7 +16656,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
guint64 result = 0ULL;
guint64 flags = 0ULL;
gboolean committed = FALSE;
- gboolean _tmp17_ = FALSE;
+ gboolean _tmp17_;
GError * _inner_error_ = NULL;
#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16642,21 +16666,21 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
flags = (guint64) 0;
#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 16644 "Photo.c"
+#line 16668 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16651 "Photo.c"
- {
- PhotoRow* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
- PhotoRow* _tmp4_ = NULL;
- guint64 _tmp5_ = 0ULL;
- guint64 _tmp6_ = 0ULL;
+#line 16675 "Photo.c"
+ {
+ PhotoRow* _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
+ PhotoRow* _tmp4_;
+ guint64 _tmp5_;
+ guint64 _tmp6_;
#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16673,13 +16697,13 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
_tmp6_ = flags;
#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_ != _tmp6_) {
-#line 16675 "Photo.c"
- PhotoTable* _tmp7_ = NULL;
- PhotoTable* _tmp8_ = NULL;
+#line 16699 "Photo.c"
+ PhotoTable* _tmp7_;
+ PhotoTable* _tmp8_;
PhotoID _tmp9_ = {0};
- guint64 _tmp10_ = 0ULL;
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
+ guint64 _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = photo_table_get_instance ();
#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16698,31 +16722,31 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
_tmp12_ = committed;
#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 16700 "Photo.c"
- PhotoRow* _tmp13_ = NULL;
- guint64 _tmp14_ = 0ULL;
+#line 16724 "Photo.c"
+ PhotoRow* _tmp13_;
+ guint64 _tmp14_;
#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->row;
#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = flags;
#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_->flags = _tmp14_;
-#line 16709 "Photo.c"
+#line 16733 "Photo.c"
}
}
}
- __finally331:
+ __finally332:
{
- PhotoRow* _tmp15_ = NULL;
+ PhotoRow* _tmp15_;
#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = self->row;
#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16720 "Photo.c"
+#line 16744 "Photo.c"
}
#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16724 "Photo.c"
+#line 16748 "Photo.c"
guint64 _tmp16_ = 0ULL;
#line 2135 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16730,26 +16754,26 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
g_clear_error (&_inner_error_);
#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp16_;
-#line 16732 "Photo.c"
+#line 16756 "Photo.c"
}
}
#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = committed;
#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp17_) {
-#line 16739 "Photo.c"
- Alteration* _tmp18_ = NULL;
+#line 16763 "Photo.c"
+ Alteration* _tmp18_;
#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = additional_alteration;
#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_flags_altered (self, _tmp18_);
-#line 16745 "Photo.c"
+#line 16769 "Photo.c"
}
#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
result = flags;
#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16751 "Photo.c"
+#line 16775 "Photo.c"
}
@@ -16758,45 +16782,45 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
GError * _inner_error_ = NULL;
#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16760 "Photo.c"
+#line 16784 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp5_ = FALSE;
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16768 "Photo.c"
+#line 16792 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ PhotoRow* _tmp1_;
+ gboolean _tmp2_;
#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->metadata_dirty;
#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 16778 "Photo.c"
+#line 16802 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16785 "Photo.c"
+#line 16809 "Photo.c"
}
#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16789 "Photo.c"
+#line 16813 "Photo.c"
}
- __finally332:
+ __finally333:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16798 "Photo.c"
+#line 16822 "Photo.c"
}
#line 2151 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16804,31 +16828,31 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
g_clear_error (&_inner_error_);
#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 16806 "Photo.c"
+#line 16830 "Photo.c"
}
}
void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** error) {
gboolean committed = FALSE;
- gboolean _tmp11_ = FALSE;
+ gboolean _tmp11_;
GError * _inner_error_ = NULL;
#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 16819 "Photo.c"
+#line 16843 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16826 "Photo.c"
+#line 16850 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ PhotoRow* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16837,13 +16861,13 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
_tmp3_ = dirty;
#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != _tmp3_) {
-#line 16839 "Photo.c"
- PhotoTable* _tmp4_ = NULL;
- PhotoTable* _tmp5_ = NULL;
+#line 16863 "Photo.c"
+ PhotoTable* _tmp4_;
+ PhotoTable* _tmp5_;
PhotoID _tmp6_ = {0};
- gboolean _tmp7_ = FALSE;
- PhotoRow* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ gboolean _tmp7_;
+ PhotoRow* _tmp8_;
+ gboolean _tmp9_;
#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_table_get_instance ();
#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16858,8 +16882,8 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
_database_table_unref0 (_tmp5_);
#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16860 "Photo.c"
- goto __finally333;
+#line 16884 "Photo.c"
+ goto __finally334;
}
#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->row;
@@ -16869,17 +16893,17 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
_tmp8_->metadata_dirty = _tmp9_;
#line 2162 "/home/jens/Source/shotwell/src/Photo.vala"
committed = TRUE;
-#line 16871 "Photo.c"
+#line 16895 "Photo.c"
}
}
- __finally333:
+ __finally334:
{
- PhotoRow* _tmp10_ = NULL;
+ PhotoRow* _tmp10_;
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->row;
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16881 "Photo.c"
+#line 16905 "Photo.c"
}
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16889,7 +16913,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
g_propagate_error (error, _inner_error_);
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 16891 "Photo.c"
+#line 16915 "Photo.c"
} else {
#line 2158 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16897,7 +16921,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
g_clear_error (&_inner_error_);
#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 16899 "Photo.c"
+#line 16923 "Photo.c"
}
}
}
@@ -16905,9 +16929,9 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
_tmp11_ = committed;
#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 16907 "Photo.c"
- Alteration* _tmp12_ = NULL;
- Alteration* _tmp13_ = NULL;
+#line 16931 "Photo.c"
+ Alteration* _tmp12_;
+ Alteration* _tmp13_;
#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = alteration_new ("metadata", "master-dirty");
#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16916,7 +16940,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp13_);
-#line 16918 "Photo.c"
+#line 16942 "Photo.c"
}
}
@@ -16927,44 +16951,44 @@ static Rating photo_real_get_rating (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 16929 "Photo.c"
+#line 16953 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16936 "Photo.c"
+#line 16960 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- Rating _tmp2_ = 0;
+ PhotoRow* _tmp1_;
+ Rating _tmp2_;
#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->rating;
#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 16946 "Photo.c"
+#line 16970 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16953 "Photo.c"
+#line 16977 "Photo.c"
}
#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 16957 "Photo.c"
+#line 16981 "Photo.c"
}
- __finally334:
+ __finally335:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16966 "Photo.c"
+#line 16990 "Photo.c"
}
#line 2171 "/home/jens/Source/shotwell/src/Photo.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);
@@ -16972,7 +16996,7 @@ static Rating photo_real_get_rating (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 16974 "Photo.c"
+#line 16998 "Photo.c"
}
}
@@ -16980,25 +17004,25 @@ static Rating photo_real_get_rating (MediaSource* base) {
static void photo_real_set_rating (MediaSource* base, Rating rating) {
Photo * self;
gboolean committed = FALSE;
- gboolean _tmp16_ = FALSE;
+ gboolean _tmp16_;
GError * _inner_error_ = NULL;
#line 2176 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 16988 "Photo.c"
+#line 17012 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16995 "Photo.c"
+#line 17019 "Photo.c"
{
gboolean _tmp1_ = FALSE;
- Rating _tmp2_ = 0;
- PhotoRow* _tmp3_ = NULL;
- Rating _tmp4_ = 0;
+ Rating _tmp2_;
+ PhotoRow* _tmp3_;
+ Rating _tmp4_;
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = rating;
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17007,30 +17031,30 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
_tmp4_ = _tmp3_->rating;
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != _tmp4_) {
-#line 17009 "Photo.c"
- Rating _tmp5_ = 0;
- gboolean _tmp6_ = FALSE;
+#line 17033 "Photo.c"
+ Rating _tmp5_;
+ gboolean _tmp6_;
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = rating;
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = rating_is_valid (_tmp5_);
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp6_;
-#line 17018 "Photo.c"
+#line 17042 "Photo.c"
} else {
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 17022 "Photo.c"
+#line 17046 "Photo.c"
}
#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
-#line 17026 "Photo.c"
- PhotoTable* _tmp7_ = NULL;
- PhotoTable* _tmp8_ = NULL;
+#line 17050 "Photo.c"
+ PhotoTable* _tmp7_;
+ PhotoTable* _tmp8_;
PhotoID _tmp9_ = {0};
- Rating _tmp10_ = 0;
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
+ Rating _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = photo_table_get_instance ();
#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17049,27 +17073,27 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
_tmp12_ = committed;
#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 17051 "Photo.c"
- PhotoRow* _tmp13_ = NULL;
- Rating _tmp14_ = 0;
+#line 17075 "Photo.c"
+ PhotoRow* _tmp13_;
+ Rating _tmp14_;
#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->row;
#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = rating;
#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_->rating = _tmp14_;
-#line 17060 "Photo.c"
+#line 17084 "Photo.c"
}
}
}
- __finally335:
+ __finally336:
{
- PhotoRow* _tmp15_ = NULL;
+ PhotoRow* _tmp15_;
#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = self->row;
#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17071 "Photo.c"
+#line 17095 "Photo.c"
}
#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17079,16 +17103,16 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
g_clear_error (&_inner_error_);
#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17081 "Photo.c"
+#line 17105 "Photo.c"
}
}
#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = committed;
#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp16_) {
-#line 17088 "Photo.c"
- Alteration* _tmp17_ = NULL;
- Alteration* _tmp18_ = NULL;
+#line 17112 "Photo.c"
+ Alteration* _tmp17_;
+ Alteration* _tmp18_;
#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = alteration_new ("metadata", "rating");
#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17097,7 +17121,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp18_);
-#line 17099 "Photo.c"
+#line 17123 "Photo.c"
}
}
@@ -17107,18 +17131,18 @@ static void photo_real_increase_rating (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17109 "Photo.c"
+#line 17133 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17116 "Photo.c"
+#line 17140 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- Rating _tmp2_ = 0;
- Rating _tmp3_ = 0;
+ PhotoRow* _tmp1_;
+ Rating _tmp2_;
+ Rating _tmp3_;
#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17127,16 +17151,16 @@ static void photo_real_increase_rating (MediaSource* base) {
_tmp3_ = rating_increase (_tmp2_);
#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17129 "Photo.c"
+#line 17153 "Photo.c"
}
- __finally336:
+ __finally337:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17138 "Photo.c"
+#line 17162 "Photo.c"
}
#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17146,7 +17170,7 @@ static void photo_real_increase_rating (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17148 "Photo.c"
+#line 17172 "Photo.c"
}
}
}
@@ -17157,18 +17181,18 @@ static void photo_real_decrease_rating (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17159 "Photo.c"
+#line 17183 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17166 "Photo.c"
+#line 17190 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- Rating _tmp2_ = 0;
- Rating _tmp3_ = 0;
+ PhotoRow* _tmp1_;
+ Rating _tmp2_;
+ Rating _tmp3_;
#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17177,16 +17201,16 @@ static void photo_real_decrease_rating (MediaSource* base) {
_tmp3_ = rating_decrease (_tmp2_);
#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17179 "Photo.c"
+#line 17203 "Photo.c"
}
- __finally337:
+ __finally338:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17188 "Photo.c"
+#line 17212 "Photo.c"
}
#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17196,7 +17220,7 @@ static void photo_real_decrease_rating (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17198 "Photo.c"
+#line 17222 "Photo.c"
}
}
}
@@ -17209,12 +17233,12 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 17211 "Photo.c"
+#line 17235 "Photo.c"
{
- PhotoTable* _tmp0_ = NULL;
- PhotoTable* _tmp1_ = NULL;
+ PhotoTable* _tmp0_;
+ PhotoTable* _tmp1_;
PhotoID _tmp2_ = {0};
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp3_;
#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo_table_get_instance ();
#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17231,8 +17255,8 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17233 "Photo.c"
- goto __catch338_database_error;
+#line 17257 "Photo.c"
+ goto __catch339_database_error;
}
#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17240,19 +17264,19 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
g_clear_error (&_inner_error_);
#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17242 "Photo.c"
+#line 17266 "Photo.c"
}
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17250 "Photo.c"
+#line 17274 "Photo.c"
{
- PhotoRow* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ PhotoRow* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17263,23 +17287,23 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
_g_free0 (_tmp5_->backlinks);
#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_->backlinks = _tmp7_;
-#line 17265 "Photo.c"
+#line 17289 "Photo.c"
}
- __finally339:
+ __finally340:
{
- PhotoRow* _tmp8_ = NULL;
+ PhotoRow* _tmp8_;
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->row;
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17274 "Photo.c"
+#line 17298 "Photo.c"
}
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17280 "Photo.c"
- goto __catch338_database_error;
+#line 17304 "Photo.c"
+ goto __catch339_database_error;
}
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17287,18 +17311,18 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
g_clear_error (&_inner_error_);
#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17289 "Photo.c"
+#line 17313 "Photo.c"
}
}
}
- goto __finally338;
- __catch338_database_error:
+ goto __finally339;
+ __catch339_database_error:
{
GError* err = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ GError* _tmp11_;
+ const gchar* _tmp12_;
#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17317,9 +17341,9 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
_g_free0 (_tmp10_);
#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 17319 "Photo.c"
+#line 17343 "Photo.c"
}
- __finally338:
+ __finally339:
#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17328,7 +17352,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
g_clear_error (&_inner_error_);
#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17330 "Photo.c"
+#line 17354 "Photo.c"
}
}
@@ -17341,25 +17365,25 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (event_id != NULL, FALSE);
-#line 17343 "Photo.c"
+#line 17367 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp13_ = FALSE;
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17351 "Photo.c"
+#line 17375 "Photo.c"
{
gboolean committed = FALSE;
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- PhotoRow* _tmp3_ = NULL;
- PhotoID _tmp4_ = {0};
- EventID _tmp5_ = {0};
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
+ PhotoRow* _tmp3_;
+ PhotoID _tmp4_;
+ EventID _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp7_;
+ gboolean _tmp8_;
#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_table_get_instance ();
#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17382,40 +17406,40 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
_tmp8_ = committed;
#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
-#line 17384 "Photo.c"
- PhotoRow* _tmp9_ = NULL;
- EventID _tmp10_ = {0};
+#line 17408 "Photo.c"
+ PhotoRow* _tmp9_;
+ EventID _tmp10_;
#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = *event_id;
#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_->event_id = _tmp10_;
-#line 17393 "Photo.c"
+#line 17417 "Photo.c"
}
#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
result = committed;
-#line 17397 "Photo.c"
+#line 17421 "Photo.c"
{
- PhotoRow* _tmp11_ = NULL;
+ PhotoRow* _tmp11_;
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->row;
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17404 "Photo.c"
+#line 17428 "Photo.c"
}
#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 17408 "Photo.c"
+#line 17432 "Photo.c"
}
- __finally340:
+ __finally341:
{
- PhotoRow* _tmp12_ = NULL;
+ PhotoRow* _tmp12_;
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->row;
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17417 "Photo.c"
+#line 17441 "Photo.c"
}
#line 2222 "/home/jens/Source/shotwell/src/Photo.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);
@@ -17423,7 +17447,7 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
g_clear_error (&_inner_error_);
#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp13_;
-#line 17425 "Photo.c"
+#line 17449 "Photo.c"
}
}
@@ -17432,31 +17456,31 @@ static gchar* photo_real_to_string (DataObject* base) {
Photo * self;
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
PhotoID _tmp10_ = {0};
- gint64 _tmp11_ = 0LL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- PhotoFileReader* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
+ gint64 _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ PhotoFileReader* _tmp14_;
+ PhotoFileReader* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_is_master_baseline (self);
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp1_) {
-#line 17451 "Photo.c"
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+#line 17475 "Photo.c"
+ GFile* _tmp2_;
+ GFile* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = photo_get_actual_file (self);
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17481,16 +17505,16 @@ static gchar* photo_real_to_string (DataObject* base) {
_g_free0 (_tmp5_);
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp3_);
-#line 17483 "Photo.c"
+#line 17507 "Photo.c"
} else {
- gchar* _tmp9_ = NULL;
+ gchar* _tmp9_;
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = g_strdup ("");
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp0_);
#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp9_;
-#line 17492 "Photo.c"
+#line 17516 "Photo.c"
}
#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
photo_get_photo_id (self, &_tmp10_);
@@ -17524,7 +17548,7 @@ static gchar* photo_real_to_string (DataObject* base) {
_g_free0 (_tmp0_);
#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 17526 "Photo.c"
+#line 17550 "Photo.c"
}
@@ -17532,11 +17556,11 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
Photo * self;
gboolean result = FALSE;
Photo* photo = NULL;
- DataSource* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- DataSource* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ DataSource* _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ DataSource* _tmp14_;
+ gboolean _tmp15_;
#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17551,14 +17575,14 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
_tmp2_ = photo;
#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 17553 "Photo.c"
+#line 17577 "Photo.c"
PhotoID photo_id = {0};
PhotoID _tmp3_ = {0};
PhotoID other_photo_id = {0};
- Photo* _tmp4_ = NULL;
+ Photo* _tmp4_;
PhotoID _tmp5_ = {0};
gboolean _tmp6_ = FALSE;
- Photo* _tmp7_ = NULL;
+ Photo* _tmp7_;
#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
photo_get_photo_id (self, &_tmp3_);
#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17573,28 +17597,28 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
_tmp7_ = photo;
#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
if (self != _tmp7_) {
-#line 17575 "Photo.c"
- PhotoID _tmp8_ = {0};
- gint64 _tmp9_ = 0LL;
+#line 17599 "Photo.c"
+ PhotoID _tmp8_;
+ gint64 _tmp9_;
#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_id;
#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = _tmp8_.id;
#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17584 "Photo.c"
+#line 17608 "Photo.c"
} else {
#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = FALSE;
-#line 17588 "Photo.c"
+#line 17612 "Photo.c"
}
#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_) {
-#line 17592 "Photo.c"
- PhotoID _tmp10_ = {0};
- gint64 _tmp11_ = 0LL;
- PhotoID _tmp12_ = {0};
- gint64 _tmp13_ = 0LL;
+#line 17616 "Photo.c"
+ PhotoID _tmp10_;
+ gint64 _tmp11_;
+ PhotoID _tmp12_;
+ gint64 _tmp13_;
#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = photo_id;
#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17605,7 +17629,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
_tmp13_ = _tmp12_.id;
#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id");
-#line 17607 "Photo.c"
+#line 17631 "Photo.c"
}
}
#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17618,25 +17642,25 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
_g_object_unref0 (photo);
#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 17620 "Photo.c"
+#line 17644 "Photo.c"
}
static void photo_file_exif_updated (Photo* self) {
GFile* file = NULL;
- GFile* _tmp0_ = NULL;
+ GFile* _tmp0_;
GFileInfo* info = NULL;
GTimeVal timestamp = {0};
- GFileInfo* _tmp7_ = NULL;
+ GFileInfo* _tmp7_;
GTimeVal _tmp8_ = {0};
PhotoFileInterrogator* interrogator = NULL;
- PhotoFileInterrogator* _tmp9_ = NULL;
+ PhotoFileInterrogator* _tmp9_;
DetectedPhotoInformation* detected = NULL;
- DetectedPhotoInformation* _tmp14_ = NULL;
+ DetectedPhotoInformation* _tmp14_;
gboolean _tmp15_ = FALSE;
- DetectedPhotoInformation* _tmp16_ = NULL;
+ DetectedPhotoInformation* _tmp16_;
gboolean success = FALSE;
- gboolean _tmp37_ = FALSE;
+ gboolean _tmp37_;
GError * _inner_error_ = NULL;
#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -17646,19 +17670,19 @@ static void photo_file_exif_updated (Photo* self) {
file = _tmp0_;
#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
info = NULL;
-#line 17648 "Photo.c"
+#line 17672 "Photo.c"
{
GFileInfo* _tmp1_ = NULL;
- GFileInfo* _tmp2_ = NULL;
- GFileInfo* _tmp3_ = NULL;
+ GFileInfo* _tmp2_;
+ GFileInfo* _tmp3_;
#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp2_;
#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17659 "Photo.c"
- goto __catch341_g_error;
+#line 17683 "Photo.c"
+ goto __catch342_g_error;
}
#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp1_;
@@ -17670,15 +17694,15 @@ static void photo_file_exif_updated (Photo* self) {
info = _tmp3_;
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp1_);
-#line 17672 "Photo.c"
+#line 17696 "Photo.c"
}
- goto __finally341;
- __catch341_g_error:
+ goto __finally342;
+ __catch342_g_error:
{
GError* err = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17695,9 +17719,9 @@ static void photo_file_exif_updated (Photo* self) {
_g_free0 (_tmp5_);
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 17697 "Photo.c"
+#line 17721 "Photo.c"
}
- __finally341:
+ __finally342:
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17710,7 +17734,7 @@ static void photo_file_exif_updated (Photo* self) {
g_clear_error (&_inner_error_);
#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17712 "Photo.c"
+#line 17736 "Photo.c"
}
#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = info;
@@ -17722,24 +17746,24 @@ static void photo_file_exif_updated (Photo* self) {
_tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
interrogator = _tmp9_;
-#line 17724 "Photo.c"
+#line 17748 "Photo.c"
{
#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
photo_file_interrogator_interrogate (interrogator, &_inner_error_);
#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17730 "Photo.c"
- goto __catch342_g_error;
+#line 17754 "Photo.c"
+ goto __catch343_g_error;
}
}
- goto __finally342;
- __catch342_g_error:
+ goto __finally343;
+ __catch343_g_error:
{
GError* err = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- GError* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ GError* _tmp12_;
+ const gchar* _tmp13_;
#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17758,9 +17782,9 @@ static void photo_file_exif_updated (Photo* self) {
_g_free0 (_tmp11_);
#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 17760 "Photo.c"
+#line 17784 "Photo.c"
}
- __finally342:
+ __finally343:
#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17775,7 +17799,7 @@ static void photo_file_exif_updated (Photo* self) {
g_clear_error (&_inner_error_);
#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17777 "Photo.c"
+#line 17801 "Photo.c"
}
#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -17787,20 +17811,20 @@ static void photo_file_exif_updated (Photo* self) {
if (_tmp16_ == NULL) {
#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = TRUE;
-#line 17789 "Photo.c"
+#line 17813 "Photo.c"
} else {
- gboolean _tmp17_ = FALSE;
+ gboolean _tmp17_;
#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = _tmp17_;
-#line 17796 "Photo.c"
+#line 17820 "Photo.c"
}
#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_) {
-#line 17800 "Photo.c"
- gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
+#line 17824 "Photo.c"
+ gchar* _tmp18_;
+ gchar* _tmp19_;
#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17819,31 +17843,31 @@ static void photo_file_exif_updated (Photo* self) {
_g_object_unref0 (file);
#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17821 "Photo.c"
+#line 17845 "Photo.c"
}
{
- PhotoRow* _tmp20_ = NULL;
+ PhotoRow* _tmp20_;
#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = self->row;
#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17829 "Photo.c"
+#line 17853 "Photo.c"
{
- PhotoTable* _tmp21_ = NULL;
- PhotoTable* _tmp22_ = NULL;
+ PhotoTable* _tmp21_;
+ PhotoTable* _tmp22_;
PhotoID _tmp23_ = {0};
- GFileInfo* _tmp24_ = NULL;
- gint64 _tmp25_ = 0LL;
- GTimeVal _tmp26_ = {0};
- glong _tmp27_ = 0L;
- DetectedPhotoInformation* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- DetectedPhotoInformation* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- DetectedPhotoInformation* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- PhotoRow* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
+ GFileInfo* _tmp24_;
+ gint64 _tmp25_;
+ GTimeVal _tmp26_;
+ glong _tmp27_;
+ DetectedPhotoInformation* _tmp28_;
+ const gchar* _tmp29_;
+ DetectedPhotoInformation* _tmp30_;
+ const gchar* _tmp31_;
+ DetectedPhotoInformation* _tmp32_;
+ const gchar* _tmp33_;
+ PhotoRow* _tmp34_;
+ gboolean _tmp35_;
#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = photo_table_get_instance ();
#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17878,16 +17902,16 @@ static void photo_file_exif_updated (Photo* self) {
success = _tmp35_;
#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
_database_table_unref0 (_tmp22_);
-#line 17880 "Photo.c"
+#line 17904 "Photo.c"
}
- __finally343:
+ __finally344:
{
- PhotoRow* _tmp36_ = NULL;
+ PhotoRow* _tmp36_;
#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = self->row;
#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17889 "Photo.c"
+#line 17913 "Photo.c"
}
#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17905,16 +17929,16 @@ static void photo_file_exif_updated (Photo* self) {
g_clear_error (&_inner_error_);
#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 17907 "Photo.c"
+#line 17931 "Photo.c"
}
}
#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = success;
#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp37_) {
-#line 17914 "Photo.c"
- Alteration* _tmp38_ = NULL;
- Alteration* _tmp39_ = NULL;
+#line 17938 "Photo.c"
+ Alteration* _tmp38_;
+ Alteration* _tmp39_;
#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5");
#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17923,7 +17947,7 @@ static void photo_file_exif_updated (Photo* self) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp39_);
-#line 17925 "Photo.c"
+#line 17949 "Photo.c"
}
#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
_detected_photo_information_unref0 (detected);
@@ -17933,7 +17957,7 @@ static void photo_file_exif_updated (Photo* self) {
_g_object_unref0 (info);
#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (file);
-#line 17935 "Photo.c"
+#line 17959 "Photo.c"
}
@@ -17943,45 +17967,45 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17945 "Photo.c"
+#line 17969 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
guint64 _tmp5_ = 0ULL;
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17953 "Photo.c"
+#line 17977 "Photo.c"
{
- BackingPhotoRow* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
+ BackingPhotoRow* _tmp1_;
+ gint64 _tmp2_;
#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->backing_photo_row;
#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->filesize;
#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
result = (guint64) _tmp2_;
-#line 17963 "Photo.c"
+#line 17987 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17970 "Photo.c"
+#line 17994 "Photo.c"
}
#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 17974 "Photo.c"
+#line 17998 "Photo.c"
}
- __finally344:
+ __finally345:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17983 "Photo.c"
+#line 18007 "Photo.c"
}
#line 2294 "/home/jens/Source/shotwell/src/Photo.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);
@@ -17989,7 +18013,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 17991 "Photo.c"
+#line 18015 "Photo.c"
}
}
@@ -18000,19 +18024,19 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18002 "Photo.c"
+#line 18026 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
guint64 _tmp6_ = 0ULL;
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18010 "Photo.c"
+#line 18034 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- BackingPhotoRow* _tmp2_ = NULL;
- gint64 _tmp3_ = 0LL;
+ PhotoRow* _tmp1_;
+ BackingPhotoRow* _tmp2_;
+ gint64 _tmp3_;
#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18021,27 +18045,27 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
_tmp3_ = _tmp2_->filesize;
#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
result = (guint64) _tmp3_;
-#line 18023 "Photo.c"
+#line 18047 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18030 "Photo.c"
+#line 18054 "Photo.c"
}
#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18034 "Photo.c"
+#line 18058 "Photo.c"
}
- __finally345:
+ __finally346:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18043 "Photo.c"
+#line 18067 "Photo.c"
}
#line 2300 "/home/jens/Source/shotwell/src/Photo.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);
@@ -18049,7 +18073,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp6_;
-#line 18051 "Photo.c"
+#line 18075 "Photo.c"
}
}
@@ -18059,45 +18083,45 @@ guint64 photo_get_editable_filesize (Photo* self) {
GError * _inner_error_ = NULL;
#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 18061 "Photo.c"
+#line 18085 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
guint64 _tmp5_ = 0ULL;
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18069 "Photo.c"
+#line 18093 "Photo.c"
{
- BackingPhotoRow* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
+ BackingPhotoRow* _tmp1_;
+ gint64 _tmp2_;
#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->editable;
#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->filesize;
#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
result = (guint64) _tmp2_;
-#line 18079 "Photo.c"
+#line 18103 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18086 "Photo.c"
+#line 18110 "Photo.c"
}
#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18090 "Photo.c"
+#line 18114 "Photo.c"
}
- __finally346:
+ __finally347:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18099 "Photo.c"
+#line 18123 "Photo.c"
}
#line 2306 "/home/jens/Source/shotwell/src/Photo.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);
@@ -18105,7 +18129,7 @@ guint64 photo_get_editable_filesize (Photo* self) {
g_clear_error (&_inner_error_);
#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 18107 "Photo.c"
+#line 18131 "Photo.c"
}
}
@@ -18113,7 +18137,7 @@ guint64 photo_get_editable_filesize (Photo* self) {
static time_t photo_real_get_exposure_time (Dateable* base) {
Photo * self;
time_t result = 0;
- time_t _tmp0_ = 0;
+ time_t _tmp0_;
#line 2311 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18122,7 +18146,7 @@ static time_t photo_real_get_exposure_time (Dateable* base) {
result = _tmp0_;
#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18124 "Photo.c"
+#line 18148 "Photo.c"
}
@@ -18132,44 +18156,44 @@ static gchar* photo_real_get_basename (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18134 "Photo.c"
+#line 18158 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18141 "Photo.c"
+#line 18165 "Photo.c"
{
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->file_title;
#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = g_strdup (_tmp1_);
#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 18151 "Photo.c"
+#line 18175 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18158 "Photo.c"
+#line 18182 "Photo.c"
}
#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18162 "Photo.c"
+#line 18186 "Photo.c"
}
- __finally347:
+ __finally348:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18171 "Photo.c"
+#line 18195 "Photo.c"
}
#line 2316 "/home/jens/Source/shotwell/src/Photo.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);
@@ -18177,7 +18201,7 @@ static gchar* photo_real_get_basename (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 18179 "Photo.c"
+#line 18203 "Photo.c"
}
}
@@ -18188,18 +18212,18 @@ static gchar* photo_real_get_title (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18190 "Photo.c"
+#line 18214 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18197 "Photo.c"
+#line 18221 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ PhotoRow* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18208,27 +18232,27 @@ static gchar* photo_real_get_title (MediaSource* base) {
_tmp3_ = g_strdup (_tmp2_);
#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 18210 "Photo.c"
+#line 18234 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18217 "Photo.c"
+#line 18241 "Photo.c"
}
#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18221 "Photo.c"
+#line 18245 "Photo.c"
}
- __finally348:
+ __finally349:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18230 "Photo.c"
+#line 18254 "Photo.c"
}
#line 2322 "/home/jens/Source/shotwell/src/Photo.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);
@@ -18236,7 +18260,7 @@ static gchar* photo_real_get_title (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 18238 "Photo.c"
+#line 18262 "Photo.c"
}
}
@@ -18247,18 +18271,18 @@ static gchar* photo_real_get_comment (MediaSource* base) {
GError * _inner_error_ = NULL;
#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18249 "Photo.c"
+#line 18273 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18256 "Photo.c"
+#line 18280 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ PhotoRow* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18267,27 +18291,27 @@ static gchar* photo_real_get_comment (MediaSource* base) {
_tmp3_ = g_strdup (_tmp2_);
#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 18269 "Photo.c"
+#line 18293 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18276 "Photo.c"
+#line 18300 "Photo.c"
}
#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18280 "Photo.c"
+#line 18304 "Photo.c"
}
- __finally349:
+ __finally350:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18289 "Photo.c"
+#line 18313 "Photo.c"
}
#line 2328 "/home/jens/Source/shotwell/src/Photo.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);
@@ -18295,7 +18319,7 @@ static gchar* photo_real_get_comment (MediaSource* base) {
g_clear_error (&_inner_error_);
#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 18297 "Photo.c"
+#line 18321 "Photo.c"
}
}
@@ -18303,10 +18327,10 @@ static gchar* photo_real_get_comment (MediaSource* base) {
static void photo_real_set_title (MediaSource* base, const gchar* title) {
Photo * self;
gchar* new_title = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
gboolean committed = FALSE;
- gboolean _tmp18_ = FALSE;
+ gboolean _tmp18_;
GError * _inner_error_ = NULL;
#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -18318,25 +18342,25 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
new_title = _tmp1_;
#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 18320 "Photo.c"
+#line 18344 "Photo.c"
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18327 "Photo.c"
- {
- const gchar* _tmp3_ = NULL;
- PhotoRow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- PhotoTable* _tmp7_ = NULL;
- PhotoTable* _tmp8_ = NULL;
- PhotoRow* _tmp9_ = NULL;
- PhotoID _tmp10_ = {0};
- const gchar* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
+#line 18351 "Photo.c"
+ {
+ const gchar* _tmp3_;
+ PhotoRow* _tmp4_;
+ const gchar* _tmp5_;
+ PhotoTable* _tmp7_;
+ PhotoTable* _tmp8_;
+ PhotoRow* _tmp9_;
+ PhotoID _tmp10_;
+ const gchar* _tmp11_;
+ gboolean _tmp12_;
+ gboolean _tmp13_;
#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = new_title;
#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18345,20 +18369,20 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
_tmp5_ = _tmp4_->title;
#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 18347 "Photo.c"
+#line 18371 "Photo.c"
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18354 "Photo.c"
+#line 18378 "Photo.c"
}
#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (new_title);
#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18360 "Photo.c"
+#line 18384 "Photo.c"
}
#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = photo_table_get_instance ();
@@ -18380,10 +18404,10 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
_tmp13_ = committed;
#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
-#line 18382 "Photo.c"
- PhotoRow* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+#line 18406 "Photo.c"
+ PhotoRow* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18394,17 +18418,17 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
_g_free0 (_tmp14_->title);
#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_->title = _tmp16_;
-#line 18396 "Photo.c"
+#line 18420 "Photo.c"
}
}
- __finally350:
+ __finally351:
{
- PhotoRow* _tmp17_ = NULL;
+ PhotoRow* _tmp17_;
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = self->row;
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18406 "Photo.c"
+#line 18430 "Photo.c"
}
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18416,16 +18440,16 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
g_clear_error (&_inner_error_);
#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18418 "Photo.c"
+#line 18442 "Photo.c"
}
}
#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = committed;
#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_) {
-#line 18425 "Photo.c"
- Alteration* _tmp19_ = NULL;
- Alteration* _tmp20_ = NULL;
+#line 18449 "Photo.c"
+ Alteration* _tmp19_;
+ Alteration* _tmp20_;
#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = alteration_new ("metadata", "name");
#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18434,11 +18458,11 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp20_);
-#line 18436 "Photo.c"
+#line 18460 "Photo.c"
}
#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (new_title);
-#line 18440 "Photo.c"
+#line 18464 "Photo.c"
}
@@ -18446,10 +18470,10 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
Photo * self;
gboolean result = FALSE;
gchar* new_comment = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
gboolean committed = FALSE;
- gboolean _tmp19_ = FALSE;
+ gboolean _tmp19_;
GError * _inner_error_ = NULL;
#line 2350 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -18461,25 +18485,25 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
new_comment = _tmp1_;
#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 18463 "Photo.c"
+#line 18487 "Photo.c"
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18470 "Photo.c"
- {
- const gchar* _tmp3_ = NULL;
- PhotoRow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- PhotoTable* _tmp7_ = NULL;
- PhotoTable* _tmp8_ = NULL;
- PhotoRow* _tmp9_ = NULL;
- PhotoID _tmp10_ = {0};
- const gchar* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- gboolean _tmp13_ = FALSE;
+#line 18494 "Photo.c"
+ {
+ const gchar* _tmp3_;
+ PhotoRow* _tmp4_;
+ const gchar* _tmp5_;
+ PhotoTable* _tmp7_;
+ PhotoTable* _tmp8_;
+ PhotoRow* _tmp9_;
+ PhotoID _tmp10_;
+ const gchar* _tmp11_;
+ gboolean _tmp12_;
+ gboolean _tmp13_;
#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = new_comment;
#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18490,20 +18514,20 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
-#line 18492 "Photo.c"
+#line 18516 "Photo.c"
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18499 "Photo.c"
+#line 18523 "Photo.c"
}
#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (new_comment);
#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18505 "Photo.c"
+#line 18529 "Photo.c"
}
#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = photo_table_get_instance ();
@@ -18525,10 +18549,10 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
_tmp13_ = committed;
#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
-#line 18527 "Photo.c"
- PhotoRow* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+#line 18551 "Photo.c"
+ PhotoRow* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18539,21 +18563,21 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
_g_free0 (_tmp14_->comment);
#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_->comment = _tmp16_;
-#line 18541 "Photo.c"
+#line 18565 "Photo.c"
}
}
- __finally351:
+ __finally352:
{
- PhotoRow* _tmp17_ = NULL;
+ PhotoRow* _tmp17_;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = self->row;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18551 "Photo.c"
+#line 18575 "Photo.c"
}
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18555 "Photo.c"
+#line 18579 "Photo.c"
gboolean _tmp18_ = FALSE;
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (new_comment);
@@ -18563,16 +18587,16 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
g_clear_error (&_inner_error_);
#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp18_;
-#line 18565 "Photo.c"
+#line 18589 "Photo.c"
}
}
#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = committed;
#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp19_) {
-#line 18572 "Photo.c"
- Alteration* _tmp20_ = NULL;
- Alteration* _tmp21_ = NULL;
+#line 18596 "Photo.c"
+ Alteration* _tmp20_;
+ Alteration* _tmp21_;
#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = alteration_new ("metadata", "comment");
#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18581,7 +18605,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp21_);
-#line 18583 "Photo.c"
+#line 18607 "Photo.c"
}
#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
result = committed;
@@ -18589,20 +18613,20 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
_g_free0 (new_comment);
#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 18591 "Photo.c"
+#line 18615 "Photo.c"
}
static gpointer _g_error_copy0 (gpointer self) {
#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? g_error_copy (self) : NULL;
-#line 18598 "Photo.c"
+#line 18622 "Photo.c"
}
void photo_set_import_id (Photo* self, ImportID* import_id) {
GError* dberr = NULL;
- GError* _tmp13_ = NULL;
+ GError* _tmp13_;
GError * _inner_error_ = NULL;
#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -18610,23 +18634,23 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
g_return_if_fail (import_id != NULL);
#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
dberr = NULL;
-#line 18612 "Photo.c"
+#line 18636 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18619 "Photo.c"
+#line 18643 "Photo.c"
{
{
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- PhotoRow* _tmp3_ = NULL;
- PhotoID _tmp4_ = {0};
- ImportID _tmp5_ = {0};
- PhotoRow* _tmp7_ = NULL;
- ImportID _tmp8_ = {0};
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
+ PhotoRow* _tmp3_;
+ PhotoID _tmp4_;
+ ImportID _tmp5_;
+ PhotoRow* _tmp7_;
+ ImportID _tmp8_;
#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_table_get_instance ();
#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18645,16 +18669,16 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 18647 "Photo.c"
- goto __catch353_database_error;
+#line 18671 "Photo.c"
+ goto __catch354_database_error;
}
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18656 "Photo.c"
+#line 18680 "Photo.c"
}
#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (dberr);
@@ -18664,7 +18688,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
g_clear_error (&_inner_error_);
#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18666 "Photo.c"
+#line 18690 "Photo.c"
}
#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->row;
@@ -18672,14 +18696,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
_tmp8_ = *import_id;
#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_->import_id = _tmp8_;
-#line 18674 "Photo.c"
+#line 18698 "Photo.c"
}
- goto __finally353;
- __catch353_database_error:
+ goto __finally354;
+ __catch354_database_error:
{
GError* err = NULL;
- GError* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
+ GError* _tmp9_;
+ GError* _tmp10_;
#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18694,19 +18718,19 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
dberr = _tmp10_;
#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 18696 "Photo.c"
+#line 18720 "Photo.c"
}
- __finally353:
+ __finally354:
#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18701 "Photo.c"
+#line 18725 "Photo.c"
{
- PhotoRow* _tmp11_ = NULL;
+ PhotoRow* _tmp11_;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->row;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18708 "Photo.c"
+#line 18732 "Photo.c"
}
#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (dberr);
@@ -18716,17 +18740,17 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
g_clear_error (&_inner_error_);
#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18718 "Photo.c"
+#line 18742 "Photo.c"
}
}
- __finally352:
+ __finally353:
{
- PhotoRow* _tmp12_ = NULL;
+ PhotoRow* _tmp12_;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->row;
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18728 "Photo.c"
+#line 18752 "Photo.c"
}
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18738,16 +18762,16 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
g_clear_error (&_inner_error_);
#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18740 "Photo.c"
+#line 18764 "Photo.c"
}
}
#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = dberr;
#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_ == NULL) {
-#line 18747 "Photo.c"
- Alteration* _tmp14_ = NULL;
- Alteration* _tmp15_ = NULL;
+#line 18771 "Photo.c"
+ Alteration* _tmp14_;
+ Alteration* _tmp15_;
#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = alteration_new ("metadata", "import-id");
#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18756,12 +18780,12 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp15_);
-#line 18758 "Photo.c"
+#line 18782 "Photo.c"
} else {
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- GError* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ GError* _tmp18_;
+ const gchar* _tmp19_;
#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18774,32 +18798,32 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
g_warning ("Photo.vala:2383: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp17_);
-#line 18776 "Photo.c"
+#line 18800 "Photo.c"
}
#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (dberr);
-#line 18780 "Photo.c"
+#line 18804 "Photo.c"
}
void photo_set_title_persistent (Photo* self, const gchar* title, GError** error) {
PhotoFileReader* source = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ PhotoFileFormat _tmp2_;
+ gboolean _tmp3_;
PhotoMetadata* metadata = NULL;
- PhotoFileReader* _tmp8_ = NULL;
- PhotoMetadata* _tmp9_ = NULL;
- PhotoMetadata* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
+ PhotoFileReader* _tmp8_;
+ PhotoMetadata* _tmp9_;
+ PhotoMetadata* _tmp10_;
+ const gchar* _tmp11_;
PhotoFileMetadataWriter* writer = NULL;
- PhotoFileReader* _tmp12_ = NULL;
- PhotoFileMetadataWriter* _tmp13_ = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
- GFile* _tmp16_ = NULL;
- const gchar* _tmp22_ = NULL;
+ PhotoFileReader* _tmp12_;
+ PhotoFileMetadataWriter* _tmp13_;
+ PhotoFileReader* _tmp14_;
+ GFile* _tmp15_;
+ GFile* _tmp16_;
+ const gchar* _tmp22_;
GError * _inner_error_ = NULL;
#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -18815,11 +18839,11 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp3_) {
-#line 18817 "Photo.c"
- PhotoFileReader* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+#line 18841 "Photo.c"
+ PhotoFileReader* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = source;
#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18838,7 +18862,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
_photo_file_adapter_unref0 (source);
#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18840 "Photo.c"
+#line 18864 "Photo.c"
}
#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = source;
@@ -18854,7 +18878,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
_photo_file_adapter_unref0 (source);
#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18856 "Photo.c"
+#line 18880 "Photo.c"
}
#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = metadata;
@@ -18878,7 +18902,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
_photo_file_adapter_unref0 (source);
#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18880 "Photo.c"
+#line 18904 "Photo.c"
}
#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = source;
@@ -18890,10 +18914,10 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title");
#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp16_);
-#line 18892 "Photo.c"
+#line 18916 "Photo.c"
{
- PhotoFileMetadataWriter* _tmp17_ = NULL;
- PhotoMetadata* _tmp18_ = NULL;
+ PhotoFileMetadataWriter* _tmp17_;
+ PhotoMetadata* _tmp18_;
#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = writer;
#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18902,15 +18926,15 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18904 "Photo.c"
- goto __finally354;
+#line 18928 "Photo.c"
+ goto __finally355;
}
}
- __finally354:
+ __finally355:
{
- PhotoFileReader* _tmp19_ = NULL;
- GFile* _tmp20_ = NULL;
- GFile* _tmp21_ = NULL;
+ PhotoFileReader* _tmp19_;
+ GFile* _tmp20_;
+ GFile* _tmp21_;
#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = source;
#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18921,7 +18945,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
library_monitor_unblacklist_file (_tmp21_);
#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp21_);
-#line 18923 "Photo.c"
+#line 18947 "Photo.c"
}
#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18935,7 +18959,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
_photo_file_adapter_unref0 (source);
#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 18937 "Photo.c"
+#line 18961 "Photo.c"
}
#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = title;
@@ -18949,28 +18973,28 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
_media_metadata_unref0 (metadata);
#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (source);
-#line 18951 "Photo.c"
+#line 18975 "Photo.c"
}
void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error) {
PhotoFileReader* source = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ PhotoFileFormat _tmp2_;
+ gboolean _tmp3_;
PhotoMetadata* metadata = NULL;
- PhotoFileReader* _tmp8_ = NULL;
- PhotoMetadata* _tmp9_ = NULL;
- PhotoMetadata* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
+ PhotoFileReader* _tmp8_;
+ PhotoMetadata* _tmp9_;
+ PhotoMetadata* _tmp10_;
+ const gchar* _tmp11_;
PhotoFileMetadataWriter* writer = NULL;
- PhotoFileReader* _tmp12_ = NULL;
- PhotoFileMetadataWriter* _tmp13_ = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
- GFile* _tmp16_ = NULL;
- const gchar* _tmp22_ = NULL;
+ PhotoFileReader* _tmp12_;
+ PhotoFileMetadataWriter* _tmp13_;
+ PhotoFileReader* _tmp14_;
+ GFile* _tmp15_;
+ GFile* _tmp16_;
+ const gchar* _tmp22_;
GError * _inner_error_ = NULL;
#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -18986,11 +19010,11 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp3_) {
-#line 18988 "Photo.c"
- PhotoFileReader* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+#line 19012 "Photo.c"
+ PhotoFileReader* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = source;
#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19009,7 +19033,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
_photo_file_adapter_unref0 (source);
#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19011 "Photo.c"
+#line 19035 "Photo.c"
}
#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = source;
@@ -19025,7 +19049,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
_photo_file_adapter_unref0 (source);
#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19027 "Photo.c"
+#line 19051 "Photo.c"
}
#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = metadata;
@@ -19049,7 +19073,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
_photo_file_adapter_unref0 (source);
#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19051 "Photo.c"
+#line 19075 "Photo.c"
}
#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = source;
@@ -19061,10 +19085,10 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment");
#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp16_);
-#line 19063 "Photo.c"
+#line 19087 "Photo.c"
{
- PhotoFileMetadataWriter* _tmp17_ = NULL;
- PhotoMetadata* _tmp18_ = NULL;
+ PhotoFileMetadataWriter* _tmp17_;
+ PhotoMetadata* _tmp18_;
#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = writer;
#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19073,15 +19097,15 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19075 "Photo.c"
- goto __finally355;
+#line 19099 "Photo.c"
+ goto __finally356;
}
}
- __finally355:
+ __finally356:
{
- PhotoFileReader* _tmp19_ = NULL;
- GFile* _tmp20_ = NULL;
- GFile* _tmp21_ = NULL;
+ PhotoFileReader* _tmp19_;
+ GFile* _tmp20_;
+ GFile* _tmp21_;
#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = source;
#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19092,7 +19116,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
library_monitor_unblacklist_file (_tmp21_);
#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp21_);
-#line 19094 "Photo.c"
+#line 19118 "Photo.c"
}
#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19106,7 +19130,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
_photo_file_adapter_unref0 (source);
#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19108 "Photo.c"
+#line 19132 "Photo.c"
}
#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = comment;
@@ -19120,33 +19144,33 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
_media_metadata_unref0 (metadata);
#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (source);
-#line 19122 "Photo.c"
+#line 19146 "Photo.c"
}
static void photo_real_set_exposure_time (Dateable* base, time_t time) {
Photo * self;
gboolean committed = FALSE;
- gboolean _tmp12_ = FALSE;
+ gboolean _tmp12_;
GError * _inner_error_ = NULL;
#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19133 "Photo.c"
+#line 19157 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19140 "Photo.c"
- {
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- PhotoRow* _tmp3_ = NULL;
- PhotoID _tmp4_ = {0};
- time_t _tmp5_ = 0;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
+#line 19164 "Photo.c"
+ {
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
+ PhotoRow* _tmp3_;
+ PhotoID _tmp4_;
+ time_t _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp7_;
#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_table_get_instance ();
#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19167,10 +19191,10 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
_tmp7_ = committed;
#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_) {
-#line 19169 "Photo.c"
- PhotoRow* _tmp8_ = NULL;
- time_t _tmp9_ = 0;
- time_t _tmp10_ = 0;
+#line 19193 "Photo.c"
+ PhotoRow* _tmp8_;
+ time_t _tmp9_;
+ time_t _tmp10_;
#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->row;
#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19181,17 +19205,17 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
_tmp10_ = time;
#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->cached_exposure_time = _tmp10_;
-#line 19183 "Photo.c"
+#line 19207 "Photo.c"
}
}
- __finally356:
+ __finally357:
{
- PhotoRow* _tmp11_ = NULL;
+ PhotoRow* _tmp11_;
#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->row;
#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19193 "Photo.c"
+#line 19217 "Photo.c"
}
#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19201,16 +19225,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
g_clear_error (&_inner_error_);
#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19203 "Photo.c"
+#line 19227 "Photo.c"
}
}
#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = committed;
#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 19210 "Photo.c"
- Alteration* _tmp13_ = NULL;
- Alteration* _tmp14_ = NULL;
+#line 19234 "Photo.c"
+ Alteration* _tmp13_;
+ Alteration* _tmp14_;
#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = alteration_new ("metadata", "exposure-time");
#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19219,31 +19243,31 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_);
#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp14_);
-#line 19221 "Photo.c"
+#line 19245 "Photo.c"
}
}
void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error) {
PhotoFileReader* source = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ PhotoFileFormat _tmp2_;
+ gboolean _tmp3_;
PhotoMetadata* metadata = NULL;
- PhotoFileReader* _tmp8_ = NULL;
- PhotoMetadata* _tmp9_ = NULL;
- PhotoMetadata* _tmp10_ = NULL;
- time_t _tmp11_ = 0;
- MetadataDateTime* _tmp12_ = NULL;
- MetadataDateTime* _tmp13_ = NULL;
+ PhotoFileReader* _tmp8_;
+ PhotoMetadata* _tmp9_;
+ PhotoMetadata* _tmp10_;
+ time_t _tmp11_;
+ MetadataDateTime* _tmp12_;
+ MetadataDateTime* _tmp13_;
PhotoFileMetadataWriter* writer = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- PhotoFileMetadataWriter* _tmp15_ = NULL;
- PhotoFileReader* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
- GFile* _tmp18_ = NULL;
- time_t _tmp24_ = 0;
+ PhotoFileReader* _tmp14_;
+ PhotoFileMetadataWriter* _tmp15_;
+ PhotoFileReader* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ time_t _tmp24_;
GError * _inner_error_ = NULL;
#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -19259,11 +19283,11 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp3_) {
-#line 19261 "Photo.c"
- PhotoFileReader* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- time_t _tmp7_ = 0;
+#line 19285 "Photo.c"
+ PhotoFileReader* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ time_t _tmp7_;
#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = source;
#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19282,7 +19306,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
_photo_file_adapter_unref0 (source);
#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19284 "Photo.c"
+#line 19308 "Photo.c"
}
#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = source;
@@ -19298,7 +19322,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
_photo_file_adapter_unref0 (source);
#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19300 "Photo.c"
+#line 19324 "Photo.c"
}
#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = metadata;
@@ -19328,7 +19352,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
_photo_file_adapter_unref0 (source);
#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19330 "Photo.c"
+#line 19354 "Photo.c"
}
#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = source;
@@ -19340,10 +19364,10 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent");
#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp18_);
-#line 19342 "Photo.c"
+#line 19366 "Photo.c"
{
- PhotoFileMetadataWriter* _tmp19_ = NULL;
- PhotoMetadata* _tmp20_ = NULL;
+ PhotoFileMetadataWriter* _tmp19_;
+ PhotoMetadata* _tmp20_;
#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = writer;
#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19352,15 +19376,15 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_);
#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19354 "Photo.c"
- goto __finally357;
+#line 19378 "Photo.c"
+ goto __finally358;
}
}
- __finally357:
+ __finally358:
{
- PhotoFileReader* _tmp21_ = NULL;
- GFile* _tmp22_ = NULL;
- GFile* _tmp23_ = NULL;
+ PhotoFileReader* _tmp21_;
+ GFile* _tmp22_;
+ GFile* _tmp23_;
#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = source;
#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19371,7 +19395,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
library_monitor_unblacklist_file (_tmp23_);
#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp23_);
-#line 19373 "Photo.c"
+#line 19397 "Photo.c"
}
#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19385,7 +19409,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
_photo_file_adapter_unref0 (source);
#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19387 "Photo.c"
+#line 19411 "Photo.c"
}
#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = time;
@@ -19399,7 +19423,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
_media_metadata_unref0 (metadata);
#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (source);
-#line 19401 "Photo.c"
+#line 19425 "Photo.c"
}
@@ -19420,12 +19444,12 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
Photo * self;
Dimensions returned_dims = {0};
Dimensions _tmp0_ = {0};
- PhotoException _tmp1_ = 0;
- gboolean _tmp2_ = FALSE;
- PhotoException _tmp10_ = 0;
- gboolean _tmp11_ = FALSE;
- PhotoException _tmp22_ = 0;
- gboolean _tmp23_ = FALSE;
+ PhotoException _tmp1_;
+ gboolean _tmp2_;
+ PhotoException _tmp10_;
+ gboolean _tmp11_;
+ PhotoException _tmp22_;
+ gboolean _tmp23_;
#line 2497 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
#line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19438,10 +19462,10 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
_tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION);
#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 19440 "Photo.c"
+#line 19464 "Photo.c"
Orientation ori_tmp = 0;
- Orientation _tmp3_ = 0;
- Orientation _tmp4_ = 0;
+ Orientation _tmp3_;
+ Orientation _tmp4_;
#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = photo_get_orientation (self);
#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19458,14 +19482,14 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
case ORIENTATION_LEFT_BOTTOM:
#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
case ORIENTATION_RIGHT_BOTTOM:
-#line 19460 "Photo.c"
+#line 19484 "Photo.c"
{
gint width_tmp = 0;
- Dimensions _tmp5_ = {0};
- gint _tmp6_ = 0;
- Dimensions _tmp7_ = {0};
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+ Dimensions _tmp5_;
+ gint _tmp6_;
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = returned_dims;
#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19484,13 +19508,13 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
returned_dims.height = _tmp9_;
#line 2516 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 19486 "Photo.c"
+#line 19510 "Photo.c"
}
default:
{
#line 2520 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 19492 "Photo.c"
+#line 19516 "Photo.c"
}
}
}
@@ -19500,20 +19524,20 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN);
#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 19502 "Photo.c"
+#line 19526 "Photo.c"
gdouble x_size = 0.0;
gdouble y_size = 0.0;
gdouble angle = 0.0;
gdouble _tmp12_ = 0.0;
- Dimensions _tmp13_ = {0};
- gint _tmp14_ = 0;
- Dimensions _tmp15_ = {0};
- gint _tmp16_ = 0;
- gdouble _tmp17_ = 0.0;
+ Dimensions _tmp13_;
+ gint _tmp14_;
+ Dimensions _tmp15_;
+ gint _tmp16_;
+ gdouble _tmp17_;
gdouble _tmp18_ = 0.0;
gdouble _tmp19_ = 0.0;
- gdouble _tmp20_ = 0.0;
- gdouble _tmp21_ = 0.0;
+ gdouble _tmp20_;
+ gdouble _tmp21_;
#line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
angle = 0.0;
#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19544,7 +19568,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
_tmp21_ = y_size;
#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
returned_dims.height = (gint) _tmp21_;
-#line 19546 "Photo.c"
+#line 19570 "Photo.c"
}
#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = disallowed_steps;
@@ -19552,11 +19576,11 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
_tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP);
#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp23_) {
-#line 19554 "Photo.c"
+#line 19578 "Photo.c"
Box crop = {0};
- PhotoException _tmp24_ = 0;
+ PhotoException _tmp24_;
Box _tmp25_ = {0};
- gboolean _tmp26_ = FALSE;
+ gboolean _tmp26_;
#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = disallowed_steps;
#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19565,30 +19589,30 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
crop = _tmp25_;
#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp26_) {
-#line 19567 "Photo.c"
+#line 19591 "Photo.c"
Dimensions _tmp27_ = {0};
#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
box_get_dimensions (&crop, &_tmp27_);
#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
returned_dims = _tmp27_;
-#line 19573 "Photo.c"
+#line 19597 "Photo.c"
}
}
#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
*result = returned_dims;
#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19580 "Photo.c"
+#line 19604 "Photo.c"
}
static void photo_locked_create_adjustments_from_data (Photo* self) {
- PixelTransformationBundle* _tmp0_ = NULL;
+ PixelTransformationBundle* _tmp0_;
KeyValueMap* map = NULL;
- KeyValueMap* _tmp1_ = NULL;
- KeyValueMap* _tmp2_ = NULL;
- PixelTransformationBundle* _tmp6_ = NULL;
- PixelTransformer* _tmp7_ = NULL;
+ KeyValueMap* _tmp1_;
+ KeyValueMap* _tmp2_;
+ PixelTransformationBundle* _tmp6_;
+ PixelTransformer* _tmp7_;
#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19605,23 +19629,23 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
_tmp2_ = map;
#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ == NULL) {
-#line 19607 "Photo.c"
- PixelTransformationBundle* _tmp3_ = NULL;
+#line 19631 "Photo.c"
+ PixelTransformationBundle* _tmp3_;
#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->adjustments;
#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
pixel_transformation_bundle_set_to_identity (_tmp3_);
-#line 19613 "Photo.c"
+#line 19637 "Photo.c"
} else {
- PixelTransformationBundle* _tmp4_ = NULL;
- KeyValueMap* _tmp5_ = NULL;
+ PixelTransformationBundle* _tmp4_;
+ KeyValueMap* _tmp5_;
#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->adjustments;
#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = map;
#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19623 "Photo.c"
+#line 19647 "Photo.c"
}
#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->adjustments;
@@ -19633,7 +19657,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
self->priv->transformer = _tmp7_;
#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
_key_value_map_unref0 (map);
-#line 19635 "Photo.c"
+#line 19659 "Photo.c"
}
@@ -19642,25 +19666,25 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
GError * _inner_error_ = NULL;
#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19644 "Photo.c"
+#line 19668 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19651 "Photo.c"
+#line 19675 "Photo.c"
{
- PixelTransformationBundle* _tmp1_ = NULL;
- PixelTransformationBundle* _tmp2_ = NULL;
- PixelTransformationBundle* _tmp3_ = NULL;
+ PixelTransformationBundle* _tmp1_;
+ PixelTransformationBundle* _tmp2_;
+ PixelTransformationBundle* _tmp3_;
#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->adjustments;
#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ == NULL) {
#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
photo_locked_create_adjustments_from_data (self);
-#line 19662 "Photo.c"
+#line 19686 "Photo.c"
}
#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->adjustments;
@@ -19668,27 +19692,27 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
_tmp3_ = pixel_transformation_bundle_copy (_tmp2_);
#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 19670 "Photo.c"
+#line 19694 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19677 "Photo.c"
+#line 19701 "Photo.c"
}
#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 19681 "Photo.c"
+#line 19705 "Photo.c"
}
- __finally358:
+ __finally359:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19690 "Photo.c"
+#line 19714 "Photo.c"
}
#line 2562 "/home/jens/Source/shotwell/src/Photo.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);
@@ -19696,7 +19720,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
g_clear_error (&_inner_error_);
#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 19698 "Photo.c"
+#line 19722 "Photo.c"
}
}
@@ -19706,25 +19730,25 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
GError * _inner_error_ = NULL;
#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19708 "Photo.c"
+#line 19732 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19715 "Photo.c"
+#line 19739 "Photo.c"
{
- PixelTransformer* _tmp1_ = NULL;
- PixelTransformer* _tmp2_ = NULL;
- PixelTransformer* _tmp3_ = NULL;
+ PixelTransformer* _tmp1_;
+ PixelTransformer* _tmp2_;
+ PixelTransformer* _tmp3_;
#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->transformer;
#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ == NULL) {
#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
photo_locked_create_adjustments_from_data (self);
-#line 19726 "Photo.c"
+#line 19750 "Photo.c"
}
#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->transformer;
@@ -19732,27 +19756,27 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
_tmp3_ = pixel_transformer_copy (_tmp2_);
#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
-#line 19734 "Photo.c"
+#line 19758 "Photo.c"
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19741 "Photo.c"
+#line 19765 "Photo.c"
}
#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 19745 "Photo.c"
+#line 19769 "Photo.c"
}
- __finally359:
+ __finally360:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19754 "Photo.c"
+#line 19778 "Photo.c"
}
#line 2571 "/home/jens/Source/shotwell/src/Photo.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);
@@ -19760,14 +19784,14 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
g_clear_error (&_inner_error_);
#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 19762 "Photo.c"
+#line 19786 "Photo.c"
}
}
gboolean photo_has_color_adjustments (Photo* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2579 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19776,17 +19800,17 @@ gboolean photo_has_color_adjustments (Photo* self) {
result = _tmp0_;
#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 19778 "Photo.c"
+#line 19802 "Photo.c"
}
PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type) {
PixelTransformation* result = NULL;
- PixelTransformationBundle* _tmp0_ = NULL;
- PixelTransformationBundle* _tmp1_ = NULL;
- PixelTransformationType _tmp2_ = 0;
- PixelTransformation* _tmp3_ = NULL;
- PixelTransformation* _tmp4_ = NULL;
+ PixelTransformationBundle* _tmp0_;
+ PixelTransformationBundle* _tmp1_;
+ PixelTransformationType _tmp2_;
+ PixelTransformation* _tmp3_;
+ PixelTransformation* _tmp4_;
#line 2583 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19805,18 +19829,18 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
result = _tmp4_;
#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 19807 "Photo.c"
+#line 19831 "Photo.c"
}
void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments) {
- PixelTransformationBundle* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ PixelTransformationBundle* _tmp0_;
+ gboolean _tmp1_;
KeyValueMap* map = NULL;
- PixelTransformationBundle* _tmp8_ = NULL;
- KeyValueMap* _tmp9_ = NULL;
+ PixelTransformationBundle* _tmp8_;
+ KeyValueMap* _tmp9_;
gboolean committed = FALSE;
- gboolean _tmp39_ = FALSE;
+ gboolean _tmp39_;
GError * _inner_error_ = NULL;
#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -19828,18 +19852,18 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_);
#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
-#line 19830 "Photo.c"
+#line 19854 "Photo.c"
gboolean _result_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19839 "Photo.c"
+#line 19863 "Photo.c"
{
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = photo_remove_transformation (self, "adjustments");
#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19852,16 +19876,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_pixel_transformer_unref0 (self->priv->transformer);
#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->transformer = NULL;
-#line 19854 "Photo.c"
+#line 19878 "Photo.c"
}
- __finally360:
+ __finally361:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19863 "Photo.c"
+#line 19887 "Photo.c"
}
#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19871,16 +19895,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
g_clear_error (&_inner_error_);
#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19873 "Photo.c"
+#line 19897 "Photo.c"
}
}
#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _result_;
#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 19880 "Photo.c"
- Alteration* _tmp6_ = NULL;
- Alteration* _tmp7_ = NULL;
+#line 19904 "Photo.c"
+ Alteration* _tmp6_;
+ Alteration* _tmp7_;
#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = alteration_new ("image", "color-adjustments");
#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19889,11 +19913,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_);
#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp7_);
-#line 19891 "Photo.c"
+#line 19915 "Photo.c"
}
#line 2601 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 19895 "Photo.c"
+#line 19919 "Photo.c"
}
#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = new_adjustments;
@@ -19901,41 +19925,41 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments");
#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
map = _tmp9_;
-#line 19903 "Photo.c"
+#line 19927 "Photo.c"
{
- PhotoRow* _tmp10_ = NULL;
+ PhotoRow* _tmp10_;
#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->row;
#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19910 "Photo.c"
+#line 19934 "Photo.c"
{
gboolean _tmp11_ = FALSE;
- PixelTransformer* _tmp12_ = NULL;
- KeyValueMap* _tmp36_ = NULL;
- gboolean _tmp37_ = FALSE;
+ PixelTransformer* _tmp12_;
+ KeyValueMap* _tmp36_;
+ gboolean _tmp37_;
#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->priv->transformer;
#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_ == NULL) {
#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = TRUE;
-#line 19922 "Photo.c"
+#line 19946 "Photo.c"
} else {
- PixelTransformationBundle* _tmp13_ = NULL;
+ PixelTransformationBundle* _tmp13_;
#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->priv->adjustments;
#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _tmp13_ == NULL;
-#line 19929 "Photo.c"
+#line 19953 "Photo.c"
}
#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 19933 "Photo.c"
- PixelTransformationBundle* _tmp14_ = NULL;
- PixelTransformationBundle* _tmp15_ = NULL;
- PixelTransformationBundle* _tmp16_ = NULL;
- PixelTransformer* _tmp17_ = NULL;
+#line 19957 "Photo.c"
+ PixelTransformationBundle* _tmp14_;
+ PixelTransformationBundle* _tmp15_;
+ PixelTransformationBundle* _tmp16_;
+ PixelTransformer* _tmp17_;
#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = new_adjustments;
#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19952,17 +19976,17 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_pixel_transformer_unref0 (self->priv->transformer);
#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->transformer = _tmp17_;
-#line 19954 "Photo.c"
+#line 19978 "Photo.c"
} else {
- PixelTransformationBundle* _tmp34_ = NULL;
- PixelTransformationBundle* _tmp35_ = NULL;
+ PixelTransformationBundle* _tmp34_;
+ PixelTransformationBundle* _tmp35_;
{
GeeIterator* _transformation_it = NULL;
- PixelTransformationBundle* _tmp18_ = NULL;
- GeeIterable* _tmp19_ = NULL;
- GeeIterable* _tmp20_ = NULL;
- GeeIterator* _tmp21_ = NULL;
- GeeIterator* _tmp22_ = NULL;
+ PixelTransformationBundle* _tmp18_;
+ GeeIterable* _tmp19_;
+ GeeIterable* _tmp20_;
+ GeeIterator* _tmp21_;
+ GeeIterator* _tmp22_;
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = new_adjustments;
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19979,19 +20003,19 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_transformation_it = _tmp22_;
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 19981 "Photo.c"
- GeeIterator* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
+#line 20005 "Photo.c"
+ GeeIterator* _tmp23_;
+ gboolean _tmp24_;
PixelTransformation* transformation = NULL;
- GeeIterator* _tmp25_ = NULL;
- gpointer _tmp26_ = NULL;
- PixelTransformer* _tmp27_ = NULL;
- PixelTransformationBundle* _tmp28_ = NULL;
- PixelTransformation* _tmp29_ = NULL;
- PixelTransformationType _tmp30_ = 0;
- PixelTransformation* _tmp31_ = NULL;
- PixelTransformation* _tmp32_ = NULL;
- PixelTransformation* _tmp33_ = NULL;
+ GeeIterator* _tmp25_;
+ gpointer _tmp26_;
+ PixelTransformer* _tmp27_;
+ PixelTransformationBundle* _tmp28_;
+ PixelTransformation* _tmp29_;
+ PixelTransformationType _tmp30_;
+ PixelTransformation* _tmp31_;
+ PixelTransformation* _tmp32_;
+ PixelTransformation* _tmp33_;
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = _transformation_it;
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20000,7 +20024,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
if (!_tmp24_) {
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 20002 "Photo.c"
+#line 20026 "Photo.c"
}
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = _transformation_it;
@@ -20028,11 +20052,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_pixel_transformation_unref0 (_tmp32_);
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformation_unref0 (transformation);
-#line 20030 "Photo.c"
+#line 20054 "Photo.c"
}
#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_transformation_it);
-#line 20034 "Photo.c"
+#line 20058 "Photo.c"
}
#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = new_adjustments;
@@ -20042,7 +20066,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_pixel_transformation_bundle_unref0 (self->priv->adjustments);
#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->adjustments = _tmp35_;
-#line 20044 "Photo.c"
+#line 20068 "Photo.c"
}
#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = map;
@@ -20050,16 +20074,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
_tmp37_ = photo_set_transformation (self, _tmp36_);
#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
committed = _tmp37_;
-#line 20052 "Photo.c"
+#line 20076 "Photo.c"
}
- __finally361:
+ __finally362:
{
- PhotoRow* _tmp38_ = NULL;
+ PhotoRow* _tmp38_;
#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = self->row;
#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20061 "Photo.c"
+#line 20085 "Photo.c"
}
#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -20071,16 +20095,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
g_clear_error (&_inner_error_);
#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20073 "Photo.c"
+#line 20097 "Photo.c"
}
}
#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = committed;
#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp39_) {
-#line 20080 "Photo.c"
- Alteration* _tmp40_ = NULL;
- Alteration* _tmp41_ = NULL;
+#line 20104 "Photo.c"
+ Alteration* _tmp40_;
+ Alteration* _tmp41_;
#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = alteration_new ("image", "color-adjustments");
#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20089,11 +20113,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_);
#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp41_);
-#line 20091 "Photo.c"
+#line 20115 "Photo.c"
}
#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
_key_value_map_unref0 (map);
-#line 20095 "Photo.c"
+#line 20119 "Photo.c"
}
@@ -20103,14 +20127,14 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
GError * _inner_error_ = NULL;
#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 20105 "Photo.c"
+#line 20129 "Photo.c"
{
PhotoMetadata* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
- PhotoMetadata* _tmp4_ = NULL;
- PhotoMetadata* _tmp5_ = NULL;
+ PhotoFileReader* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoMetadata* _tmp3_;
+ PhotoMetadata* _tmp4_;
+ PhotoMetadata* _tmp5_;
#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_get_source_reader (self);
#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20125,8 +20149,8 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
_tmp0_ = _tmp4_;
#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20127 "Photo.c"
- goto __catch362_g_error;
+#line 20151 "Photo.c"
+ goto __catch363_g_error;
}
#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp0_;
@@ -20138,14 +20162,14 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
_media_metadata_unref0 (_tmp0_);
#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20140 "Photo.c"
+#line 20164 "Photo.c"
}
- goto __finally362;
- __catch362_g_error:
+ goto __finally363;
+ __catch363_g_error:
{
GError* err = NULL;
- GError* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+ GError* _tmp6_;
+ const gchar* _tmp7_;
#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20162,27 +20186,27 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
_g_error_free0 (err);
#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20164 "Photo.c"
+#line 20188 "Photo.c"
}
- __finally362:
+ __finally363:
#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
g_clear_error (&_inner_error_);
#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 20173 "Photo.c"
+#line 20197 "Photo.c"
}
PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
PhotoMetadata* result = NULL;
PhotoMetadata* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
- PhotoMetadata* _tmp4_ = NULL;
- PhotoMetadata* _tmp5_ = NULL;
+ PhotoFileReader* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoMetadata* _tmp3_;
+ PhotoMetadata* _tmp4_;
+ PhotoMetadata* _tmp5_;
GError * _inner_error_ = NULL;
#line 2642 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -20204,7 +20228,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 20206 "Photo.c"
+#line 20230 "Photo.c"
}
#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp0_;
@@ -20216,16 +20240,16 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
_media_metadata_unref0 (_tmp0_);
#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20218 "Photo.c"
+#line 20242 "Photo.c"
}
PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
PhotoMetadata* result = NULL;
PhotoFileReader* reader = NULL;
- PhotoFileReader* _tmp0_ = NULL;
+ PhotoFileReader* _tmp0_;
PhotoMetadata* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoFileReader* _tmp2_;
GError * _inner_error_ = NULL;
#line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -20237,9 +20261,9 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
_tmp2_ = reader;
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 20239 "Photo.c"
- PhotoFileReader* _tmp3_ = NULL;
- PhotoMetadata* _tmp4_ = NULL;
+#line 20263 "Photo.c"
+ PhotoFileReader* _tmp3_;
+ PhotoMetadata* _tmp4_;
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = reader;
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20258,14 +20282,14 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
_photo_file_adapter_unref0 (reader);
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 20260 "Photo.c"
+#line 20284 "Photo.c"
}
} else {
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (_tmp1_);
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = NULL;
-#line 20267 "Photo.c"
+#line 20291 "Photo.c"
}
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
@@ -20273,28 +20297,26 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
_photo_file_adapter_unref0 (reader);
#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20275 "Photo.c"
+#line 20299 "Photo.c"
}
-gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState** state, GError** error) {
+gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportMasterState* * state, GError** error) {
PhotoReimportMasterState* _vala_state = NULL;
gboolean result = FALSE;
PhotoFileReader* master_reader = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ PhotoFileFormat _tmp2_;
+ gboolean _tmp3_;
PhotoFileMetadataWriter* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
- PhotoFileMetadataWriter* _tmp6_ = NULL;
- PhotoFileMetadataWriter* _tmp8_ = NULL;
- PhotoFileMetadataWriter* _tmp9_ = NULL;
- PhotoMetadata* _tmp10_ = NULL;
- gboolean _tmp12_ = FALSE;
- PhotoReimportMasterState* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
- PhotoReimportMasterState* _tmp16_ = NULL;
+ PhotoFileReader* _tmp5_;
+ PhotoFileMetadataWriter* _tmp6_;
+ PhotoMetadata* _tmp8_;
+ gboolean _tmp10_ = FALSE;
+ PhotoReimportMasterState* _tmp11_ = NULL;
+ gboolean _tmp12_;
+ PhotoReimportMasterState* _tmp14_;
GError * _inner_error_ = NULL;
#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20324,15 +20346,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
if (state) {
#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20326 "Photo.c"
+#line 20348 "Photo.c"
} else {
#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_state);
-#line 20330 "Photo.c"
+#line 20352 "Photo.c"
}
#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20334 "Photo.c"
+#line 20356 "Photo.c"
}
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = master_reader;
@@ -20342,7 +20364,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
_tmp4_ = _tmp6_;
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20344 "Photo.c"
+#line 20366 "Photo.c"
gboolean _tmp7_ = FALSE;
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -20350,24 +20372,16 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
_photo_file_adapter_unref0 (master_reader);
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp7_;
-#line 20352 "Photo.c"
+#line 20374 "Photo.c"
}
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp8_ = _tmp4_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp4_ = NULL;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp9_ = _tmp8_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp10_ = metadata;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_);
+ _tmp8_ = metadata;
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- _photo_file_adapter_unref0 (_tmp9_);
+ photo_file_metadata_writer_write_metadata (_tmp4_, _tmp8_, &_inner_error_);
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20368 "Photo.c"
- gboolean _tmp11_ = FALSE;
+#line 20382 "Photo.c"
+ gboolean _tmp9_ = FALSE;
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20375,21 +20389,21 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (master_reader);
#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
- return _tmp11_;
-#line 20378 "Photo.c"
+ return _tmp9_;
+#line 20392 "Photo.c"
}
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp14_ = photo_prepare_for_reimport_master (self, &_tmp13_, &_inner_error_);
+ _tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_state);
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
- _vala_state = _tmp13_;
+ _vala_state = _tmp11_;
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp12_ = _tmp14_;
+ _tmp10_ = _tmp12_;
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20390 "Photo.c"
- gboolean _tmp15_ = FALSE;
+#line 20404 "Photo.c"
+ gboolean _tmp13_ = FALSE;
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20397,11 +20411,11 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (master_reader);
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
- return _tmp15_;
-#line 20400 "Photo.c"
+ return _tmp13_;
+#line 20414 "Photo.c"
}
#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
- if (!_tmp12_) {
+ if (!_tmp10_) {
#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20412,20 +20426,20 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
if (state) {
#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20414 "Photo.c"
+#line 20428 "Photo.c"
} else {
#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_state);
-#line 20418 "Photo.c"
+#line 20432 "Photo.c"
}
#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20422 "Photo.c"
+#line 20436 "Photo.c"
}
#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp16_ = _vala_state;
+ _tmp14_ = _vala_state;
#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
- G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
+ G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20436,20 +20450,20 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
if (state) {
#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20438 "Photo.c"
+#line 20452 "Photo.c"
} else {
#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_master_state_unref0 (_vala_state);
-#line 20442 "Photo.c"
+#line 20456 "Photo.c"
}
#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20446 "Photo.c"
+#line 20460 "Photo.c"
}
void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) {
- PhotoReimportMasterState* _tmp0_ = NULL;
+ PhotoReimportMasterState* _tmp0_;
GError * _inner_error_ = NULL;
#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -20467,7 +20481,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState*
g_propagate_error (error, _inner_error_);
#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20469 "Photo.c"
+#line 20483 "Photo.c"
} else {
#line 2675 "/home/jens/Source/shotwell/src/Photo.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);
@@ -20475,31 +20489,29 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState*
g_clear_error (&_inner_error_);
#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20477 "Photo.c"
+#line 20491 "Photo.c"
}
}
}
-gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState** state, GError** error) {
+gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata, PhotoReimportEditableState* * state, GError** error) {
PhotoReimportEditableState* _vala_state = NULL;
gboolean result = FALSE;
PhotoFileReader* editable_reader = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
- gboolean _tmp4_ = FALSE;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ PhotoFileFormat _tmp3_;
+ gboolean _tmp4_;
PhotoFileMetadataWriter* _tmp5_ = NULL;
- PhotoFileReader* _tmp6_ = NULL;
- PhotoFileMetadataWriter* _tmp7_ = NULL;
- PhotoFileMetadataWriter* _tmp9_ = NULL;
- PhotoFileMetadataWriter* _tmp10_ = NULL;
- PhotoMetadata* _tmp11_ = NULL;
- gboolean _tmp13_ = FALSE;
- PhotoReimportEditableState* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
- PhotoReimportEditableState* _tmp17_ = NULL;
+ PhotoFileReader* _tmp6_;
+ PhotoFileMetadataWriter* _tmp7_;
+ PhotoMetadata* _tmp9_;
+ gboolean _tmp11_ = FALSE;
+ PhotoReimportEditableState* _tmp12_ = NULL;
+ gboolean _tmp13_;
+ PhotoReimportEditableState* _tmp15_;
GError * _inner_error_ = NULL;
#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20525,15 +20537,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
if (state) {
#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20527 "Photo.c"
+#line 20539 "Photo.c"
} else {
#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20531 "Photo.c"
+#line 20543 "Photo.c"
}
#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20535 "Photo.c"
+#line 20547 "Photo.c"
}
#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = editable_reader;
@@ -20551,15 +20563,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
if (state) {
#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20553 "Photo.c"
+#line 20565 "Photo.c"
} else {
#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20557 "Photo.c"
+#line 20569 "Photo.c"
}
#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20561 "Photo.c"
+#line 20573 "Photo.c"
}
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = editable_reader;
@@ -20569,7 +20581,7 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
_tmp5_ = _tmp7_;
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20571 "Photo.c"
+#line 20583 "Photo.c"
gboolean _tmp8_ = FALSE;
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -20577,24 +20589,16 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
_photo_file_adapter_unref0 (editable_reader);
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp8_;
-#line 20579 "Photo.c"
+#line 20591 "Photo.c"
}
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp9_ = _tmp5_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp5_ = NULL;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp10_ = _tmp9_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp11_ = metadata;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- photo_file_metadata_writer_write_metadata (_tmp10_, _tmp11_, &_inner_error_);
+ _tmp9_ = metadata;
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- _photo_file_adapter_unref0 (_tmp10_);
+ photo_file_metadata_writer_write_metadata (_tmp5_, _tmp9_, &_inner_error_);
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20595 "Photo.c"
- gboolean _tmp12_ = FALSE;
+#line 20599 "Photo.c"
+ gboolean _tmp10_ = FALSE;
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20602,21 +20606,21 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (editable_reader);
#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
- return _tmp12_;
-#line 20605 "Photo.c"
+ return _tmp10_;
+#line 20609 "Photo.c"
}
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp15_ = photo_prepare_for_reimport_editable (self, &_tmp14_, &_inner_error_);
+ _tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
- _vala_state = _tmp14_;
+ _vala_state = _tmp12_;
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp13_ = _tmp15_;
+ _tmp11_ = _tmp13_;
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20617 "Photo.c"
- gboolean _tmp16_ = FALSE;
+#line 20621 "Photo.c"
+ gboolean _tmp14_ = FALSE;
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20624,11 +20628,11 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (editable_reader);
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
- return _tmp16_;
-#line 20627 "Photo.c"
+ return _tmp14_;
+#line 20631 "Photo.c"
}
#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
- if (!_tmp13_) {
+ if (!_tmp11_) {
#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20639,20 +20643,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
if (state) {
#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20641 "Photo.c"
+#line 20645 "Photo.c"
} else {
#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20645 "Photo.c"
+#line 20649 "Photo.c"
}
#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20649 "Photo.c"
+#line 20653 "Photo.c"
}
#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp17_ = _vala_state;
+ _tmp15_ = _vala_state;
#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
- G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
+ G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20663,20 +20667,20 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
if (state) {
#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 20665 "Photo.c"
+#line 20669 "Photo.c"
} else {
#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20669 "Photo.c"
+#line 20673 "Photo.c"
}
#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20673 "Photo.c"
+#line 20677 "Photo.c"
}
void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) {
- PhotoReimportEditableState* _tmp0_ = NULL;
+ PhotoReimportEditableState* _tmp0_;
GError * _inner_error_ = NULL;
#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -20694,7 +20698,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
g_propagate_error (error, _inner_error_);
#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20696 "Photo.c"
+#line 20700 "Photo.c"
} else {
#line 2700 "/home/jens/Source/shotwell/src/Photo.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);
@@ -20702,7 +20706,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
g_clear_error (&_inner_error_);
#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20704 "Photo.c"
+#line 20708 "Photo.c"
}
}
}
@@ -20712,44 +20716,44 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
GError * _inner_error_ = NULL;
#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
-#line 20714 "Photo.c"
+#line 20718 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20721 "Photo.c"
+#line 20725 "Photo.c"
{
- BackingPhotoRow* _tmp1_ = NULL;
- Dimensions _tmp2_ = {0};
+ BackingPhotoRow* _tmp1_;
+ Dimensions _tmp2_;
#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->backing_photo_row;
#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->dim;
#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
*result = _tmp2_;
-#line 20731 "Photo.c"
+#line 20735 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20738 "Photo.c"
+#line 20742 "Photo.c"
}
#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20742 "Photo.c"
+#line 20746 "Photo.c"
}
- __finally363:
+ __finally364:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20751 "Photo.c"
+#line 20755 "Photo.c"
}
#line 2706 "/home/jens/Source/shotwell/src/Photo.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);
@@ -20757,7 +20761,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
g_clear_error (&_inner_error_);
#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 20759 "Photo.c"
+#line 20763 "Photo.c"
}
}
@@ -20767,21 +20771,21 @@ gboolean photo_has_transformations (Photo* self) {
GError * _inner_error_ = NULL;
#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 20769 "Photo.c"
+#line 20773 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp10_ = FALSE;
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20777 "Photo.c"
+#line 20781 "Photo.c"
{
gboolean _tmp1_ = FALSE;
- PhotoRow* _tmp2_ = NULL;
- Orientation _tmp3_ = 0;
- BackingPhotoRow* _tmp4_ = NULL;
- Orientation _tmp5_ = 0;
+ PhotoRow* _tmp2_;
+ Orientation _tmp3_;
+ BackingPhotoRow* _tmp4_;
+ Orientation _tmp5_;
#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20794,41 +20798,41 @@ gboolean photo_has_transformations (Photo* self) {
if (_tmp3_ != _tmp5_) {
#line 2714 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = TRUE;
-#line 20796 "Photo.c"
+#line 20800 "Photo.c"
} else {
- PhotoRow* _tmp6_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
+ PhotoRow* _tmp6_;
+ GeeHashMap* _tmp7_;
#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _tmp6_->transformations;
#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp7_ != NULL;
-#line 20806 "Photo.c"
+#line 20810 "Photo.c"
}
#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
-#line 20810 "Photo.c"
+#line 20814 "Photo.c"
{
- PhotoRow* _tmp8_ = NULL;
+ PhotoRow* _tmp8_;
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->row;
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20817 "Photo.c"
+#line 20821 "Photo.c"
}
#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20821 "Photo.c"
+#line 20825 "Photo.c"
}
- __finally364:
+ __finally365:
{
- PhotoRow* _tmp9_ = NULL;
+ PhotoRow* _tmp9_;
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20830 "Photo.c"
+#line 20834 "Photo.c"
}
#line 2712 "/home/jens/Source/shotwell/src/Photo.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);
@@ -20836,7 +20840,7 @@ gboolean photo_has_transformations (Photo* self) {
g_clear_error (&_inner_error_);
#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp10_;
-#line 20838 "Photo.c"
+#line 20842 "Photo.c"
}
}
@@ -20845,8 +20849,8 @@ gboolean photo_only_metadata_changed (Photo* self) {
gboolean result = FALSE;
MetadataDateTime* date_time = NULL;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
+ PhotoMetadata* _tmp0_;
+ PhotoMetadata* _tmp1_;
GError * _inner_error_ = NULL;
#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20860,9 +20864,9 @@ gboolean photo_only_metadata_changed (Photo* self) {
_tmp1_ = metadata;
#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ != NULL) {
-#line 20862 "Photo.c"
- PhotoMetadata* _tmp2_ = NULL;
- MetadataDateTime* _tmp3_ = NULL;
+#line 20866 "Photo.c"
+ PhotoMetadata* _tmp2_;
+ MetadataDateTime* _tmp3_;
#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = metadata;
#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20871,32 +20875,32 @@ gboolean photo_only_metadata_changed (Photo* self) {
_metadata_date_time_unref0 (date_time);
#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
date_time = _tmp3_;
-#line 20873 "Photo.c"
+#line 20877 "Photo.c"
}
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
gboolean _tmp21_ = FALSE;
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20882 "Photo.c"
+#line 20886 "Photo.c"
{
gboolean _tmp5_ = FALSE;
- PhotoRow* _tmp6_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
+ PhotoRow* _tmp6_;
+ GeeHashMap* _tmp7_;
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _tmp6_->transformations;
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_ == NULL) {
-#line 20893 "Photo.c"
+#line 20897 "Photo.c"
gboolean _tmp8_ = FALSE;
- PhotoRow* _tmp9_ = NULL;
- Orientation _tmp10_ = 0;
- BackingPhotoRow* _tmp11_ = NULL;
- Orientation _tmp12_ = 0;
+ PhotoRow* _tmp9_;
+ Orientation _tmp10_;
+ BackingPhotoRow* _tmp11_;
+ Orientation _tmp12_;
#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20909,19 +20913,19 @@ gboolean photo_only_metadata_changed (Photo* self) {
if (_tmp10_ != _tmp12_) {
#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = TRUE;
-#line 20911 "Photo.c"
+#line 20915 "Photo.c"
} else {
gboolean _tmp13_ = FALSE;
- MetadataDateTime* _tmp14_ = NULL;
+ MetadataDateTime* _tmp14_;
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = date_time;
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_ != NULL) {
-#line 20919 "Photo.c"
- PhotoRow* _tmp15_ = NULL;
- time_t _tmp16_ = 0;
- MetadataDateTime* _tmp17_ = NULL;
- time_t _tmp18_ = 0;
+#line 20923 "Photo.c"
+ PhotoRow* _tmp15_;
+ time_t _tmp16_;
+ MetadataDateTime* _tmp17_;
+ time_t _tmp18_;
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = self->row;
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20932,34 +20936,34 @@ gboolean photo_only_metadata_changed (Photo* self) {
_tmp18_ = metadata_date_time_get_timestamp (_tmp17_);
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _tmp16_ != _tmp18_;
-#line 20934 "Photo.c"
+#line 20938 "Photo.c"
} else {
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = FALSE;
-#line 20938 "Photo.c"
+#line 20942 "Photo.c"
}
#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _tmp13_;
-#line 20942 "Photo.c"
+#line 20946 "Photo.c"
}
#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp8_;
-#line 20946 "Photo.c"
+#line 20950 "Photo.c"
} else {
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = FALSE;
-#line 20950 "Photo.c"
+#line 20954 "Photo.c"
}
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp5_;
-#line 20954 "Photo.c"
+#line 20958 "Photo.c"
{
- PhotoRow* _tmp19_ = NULL;
+ PhotoRow* _tmp19_;
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20961 "Photo.c"
+#line 20965 "Photo.c"
}
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -20967,16 +20971,16 @@ gboolean photo_only_metadata_changed (Photo* self) {
_metadata_date_time_unref0 (date_time);
#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 20969 "Photo.c"
+#line 20973 "Photo.c"
}
- __finally365:
+ __finally366:
{
- PhotoRow* _tmp20_ = NULL;
+ PhotoRow* _tmp20_;
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = self->row;
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20978 "Photo.c"
+#line 20982 "Photo.c"
}
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -20988,13 +20992,13 @@ gboolean photo_only_metadata_changed (Photo* self) {
g_clear_error (&_inner_error_);
#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp21_;
-#line 20990 "Photo.c"
+#line 20994 "Photo.c"
}
#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (date_time);
-#line 20996 "Photo.c"
+#line 21000 "Photo.c"
}
@@ -21004,9 +21008,9 @@ gboolean photo_has_alterations (Photo* self) {
gchar* title = NULL;
gchar* comment = NULL;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
- MetadataDateTime* _tmp8_ = NULL;
+ PhotoMetadata* _tmp0_;
+ PhotoMetadata* _tmp1_;
+ MetadataDateTime* _tmp8_;
GError * _inner_error_ = NULL;
#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -21024,13 +21028,13 @@ gboolean photo_has_alterations (Photo* self) {
_tmp1_ = metadata;
#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ != NULL) {
-#line 21026 "Photo.c"
- PhotoMetadata* _tmp2_ = NULL;
- MetadataDateTime* _tmp3_ = NULL;
- PhotoMetadata* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- PhotoMetadata* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+#line 21030 "Photo.c"
+ PhotoMetadata* _tmp2_;
+ MetadataDateTime* _tmp3_;
+ PhotoMetadata* _tmp4_;
+ gchar* _tmp5_;
+ PhotoMetadata* _tmp6_;
+ gchar* _tmp7_;
#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = metadata;
#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21055,25 +21059,25 @@ gboolean photo_has_alterations (Photo* self) {
_g_free0 (comment);
#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
comment = _tmp7_;
-#line 21057 "Photo.c"
+#line 21061 "Photo.c"
}
#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = date_time;
#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ == NULL) {
-#line 21063 "Photo.c"
+#line 21067 "Photo.c"
{
- PhotoRow* _tmp9_ = NULL;
+ PhotoRow* _tmp9_;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21070 "Photo.c"
+#line 21074 "Photo.c"
{
- BackingPhotoRow* _tmp10_ = NULL;
- time_t _tmp11_ = 0;
- PhotoRow* _tmp12_ = NULL;
- time_t _tmp13_ = 0;
+ BackingPhotoRow* _tmp10_;
+ time_t _tmp11_;
+ PhotoRow* _tmp12_;
+ time_t _tmp13_;
#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->backing_photo_row;
#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21086,14 +21090,14 @@ gboolean photo_has_alterations (Photo* self) {
if (_tmp11_ != _tmp13_) {
#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
-#line 21088 "Photo.c"
+#line 21092 "Photo.c"
{
- PhotoRow* _tmp14_ = NULL;
+ PhotoRow* _tmp14_;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21095 "Photo.c"
+#line 21099 "Photo.c"
}
#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -21105,21 +21109,21 @@ gboolean photo_has_alterations (Photo* self) {
_metadata_date_time_unref0 (date_time);
#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21107 "Photo.c"
+#line 21111 "Photo.c"
}
}
- __finally366:
+ __finally367:
{
- PhotoRow* _tmp15_ = NULL;
+ PhotoRow* _tmp15_;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = self->row;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21117 "Photo.c"
+#line 21121 "Photo.c"
}
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21121 "Photo.c"
+#line 21125 "Photo.c"
gboolean _tmp16_ = FALSE;
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -21135,25 +21139,25 @@ gboolean photo_has_alterations (Photo* self) {
g_clear_error (&_inner_error_);
#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp16_;
-#line 21137 "Photo.c"
+#line 21141 "Photo.c"
}
}
}
{
- PhotoRow* _tmp17_ = NULL;
+ PhotoRow* _tmp17_;
gboolean _tmp42_ = FALSE;
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = self->row;
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21148 "Photo.c"
+#line 21152 "Photo.c"
{
gboolean _tmp18_ = FALSE;
gboolean _tmp19_ = FALSE;
gboolean _tmp20_ = FALSE;
gboolean _tmp21_ = FALSE;
- PhotoRow* _tmp22_ = NULL;
- GeeHashMap* _tmp23_ = NULL;
+ PhotoRow* _tmp22_;
+ GeeHashMap* _tmp23_;
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = self->row;
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21162,12 +21166,12 @@ gboolean photo_has_alterations (Photo* self) {
if (_tmp23_ != NULL) {
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = TRUE;
-#line 21164 "Photo.c"
+#line 21168 "Photo.c"
} else {
- PhotoRow* _tmp24_ = NULL;
- Orientation _tmp25_ = 0;
- BackingPhotoRow* _tmp26_ = NULL;
- Orientation _tmp27_ = 0;
+ PhotoRow* _tmp24_;
+ Orientation _tmp25_;
+ BackingPhotoRow* _tmp26_;
+ Orientation _tmp27_;
#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = self->row;
#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21178,25 +21182,25 @@ gboolean photo_has_alterations (Photo* self) {
_tmp27_ = _tmp26_->original_orientation;
#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = _tmp25_ != _tmp27_;
-#line 21180 "Photo.c"
+#line 21184 "Photo.c"
}
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_) {
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = TRUE;
-#line 21186 "Photo.c"
+#line 21190 "Photo.c"
} else {
gboolean _tmp28_ = FALSE;
- MetadataDateTime* _tmp29_ = NULL;
+ MetadataDateTime* _tmp29_;
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = date_time;
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp29_ != NULL) {
-#line 21194 "Photo.c"
- PhotoRow* _tmp30_ = NULL;
- time_t _tmp31_ = 0;
- MetadataDateTime* _tmp32_ = NULL;
- time_t _tmp33_ = 0;
+#line 21198 "Photo.c"
+ PhotoRow* _tmp30_;
+ time_t _tmp31_;
+ MetadataDateTime* _tmp32_;
+ time_t _tmp33_;
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = self->row;
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21207,25 +21211,25 @@ gboolean photo_has_alterations (Photo* self) {
_tmp33_ = metadata_date_time_get_timestamp (_tmp32_);
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = _tmp31_ != _tmp33_;
-#line 21209 "Photo.c"
+#line 21213 "Photo.c"
} else {
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = FALSE;
-#line 21213 "Photo.c"
+#line 21217 "Photo.c"
}
#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = _tmp28_;
-#line 21217 "Photo.c"
+#line 21221 "Photo.c"
}
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp20_) {
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = TRUE;
-#line 21223 "Photo.c"
+#line 21227 "Photo.c"
} else {
- gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
+ const gchar* _tmp36_;
#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21236,17 +21240,17 @@ gboolean photo_has_alterations (Photo* self) {
_tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0;
#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp35_);
-#line 21238 "Photo.c"
+#line 21242 "Photo.c"
}
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp19_) {
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = TRUE;
-#line 21244 "Photo.c"
+#line 21248 "Photo.c"
} else {
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ const gchar* _tmp39_;
#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21257,18 +21261,18 @@ gboolean photo_has_alterations (Photo* self) {
_tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0;
#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp38_);
-#line 21259 "Photo.c"
+#line 21263 "Photo.c"
}
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp18_;
-#line 21263 "Photo.c"
+#line 21267 "Photo.c"
{
- PhotoRow* _tmp40_ = NULL;
+ PhotoRow* _tmp40_;
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = self->row;
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21270 "Photo.c"
+#line 21274 "Photo.c"
}
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -21280,16 +21284,16 @@ gboolean photo_has_alterations (Photo* self) {
_metadata_date_time_unref0 (date_time);
#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21282 "Photo.c"
+#line 21286 "Photo.c"
}
- __finally367:
+ __finally368:
{
- PhotoRow* _tmp41_ = NULL;
+ PhotoRow* _tmp41_;
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = self->row;
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21291 "Photo.c"
+#line 21295 "Photo.c"
}
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -21305,7 +21309,7 @@ gboolean photo_has_alterations (Photo* self) {
g_clear_error (&_inner_error_);
#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp42_;
-#line 21307 "Photo.c"
+#line 21311 "Photo.c"
}
#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
@@ -21315,7 +21319,7 @@ gboolean photo_has_alterations (Photo* self) {
_g_free0 (title);
#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (date_time);
-#line 21317 "Photo.c"
+#line 21321 "Photo.c"
}
@@ -21324,31 +21328,31 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
GError * _inner_error_ = NULL;
#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 21326 "Photo.c"
+#line 21330 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21333 "Photo.c"
+#line 21337 "Photo.c"
{
PixelTransformer* _tmp1_ = NULL;
- PixelTransformer* _tmp2_ = NULL;
+ PixelTransformer* _tmp2_;
PixelTransformationBundle* _tmp5_ = NULL;
- PixelTransformationBundle* _tmp6_ = NULL;
- PhotoRow* _tmp9_ = NULL;
- Orientation _tmp10_ = 0;
- PhotoRow* _tmp11_ = NULL;
- GeeHashMap* _tmp12_ = NULL;
- PhotoPhotoTransformationStateImpl* _tmp13_ = NULL;
+ PixelTransformationBundle* _tmp6_;
+ PhotoRow* _tmp9_;
+ Orientation _tmp10_;
+ PhotoRow* _tmp11_;
+ GeeHashMap* _tmp12_;
+ PhotoPhotoTransformationStateImpl* _tmp13_;
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->transformer;
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 21348 "Photo.c"
- PixelTransformer* _tmp3_ = NULL;
- PixelTransformer* _tmp4_ = NULL;
+#line 21352 "Photo.c"
+ PixelTransformer* _tmp3_;
+ PixelTransformer* _tmp4_;
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->transformer;
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21357,21 +21361,21 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
_pixel_transformer_unref0 (_tmp1_);
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp4_;
-#line 21359 "Photo.c"
+#line 21363 "Photo.c"
} else {
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformer_unref0 (_tmp1_);
#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = NULL;
-#line 21365 "Photo.c"
+#line 21369 "Photo.c"
}
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->adjustments;
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ != NULL) {
-#line 21371 "Photo.c"
- PixelTransformationBundle* _tmp7_ = NULL;
- PixelTransformationBundle* _tmp8_ = NULL;
+#line 21375 "Photo.c"
+ PixelTransformationBundle* _tmp7_;
+ PixelTransformationBundle* _tmp8_;
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->adjustments;
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21380,13 +21384,13 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
_pixel_transformation_bundle_unref0 (_tmp5_);
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp8_;
-#line 21382 "Photo.c"
+#line 21386 "Photo.c"
} else {
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformation_bundle_unref0 (_tmp5_);
#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = NULL;
-#line 21388 "Photo.c"
+#line 21392 "Photo.c"
}
#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
@@ -21404,27 +21408,27 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
_pixel_transformation_bundle_unref0 (_tmp5_);
#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformer_unref0 (_tmp1_);
-#line 21406 "Photo.c"
+#line 21410 "Photo.c"
{
- PhotoRow* _tmp14_ = NULL;
+ PhotoRow* _tmp14_;
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21413 "Photo.c"
+#line 21417 "Photo.c"
}
#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21417 "Photo.c"
+#line 21421 "Photo.c"
}
- __finally368:
+ __finally369:
{
- PhotoRow* _tmp15_ = NULL;
+ PhotoRow* _tmp15_;
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = self->row;
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21426 "Photo.c"
+#line 21430 "Photo.c"
}
#line 2768 "/home/jens/Source/shotwell/src/Photo.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);
@@ -21432,7 +21436,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
g_clear_error (&_inner_error_);
#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 21434 "Photo.c"
+#line 21438 "Photo.c"
}
}
@@ -21440,37 +21444,37 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
static gpointer _pixel_transformer_ref0 (gpointer self) {
#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? pixel_transformer_ref (self) : NULL;
-#line 21442 "Photo.c"
+#line 21446 "Photo.c"
}
static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 21449 "Photo.c"
+#line 21453 "Photo.c"
}
gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state) {
gboolean result = FALSE;
PhotoPhotoTransformationStateImpl* state_impl = NULL;
- PhotoTransformationState* _tmp0_ = NULL;
- PhotoPhotoTransformationStateImpl* _tmp1_ = NULL;
- PhotoPhotoTransformationStateImpl* _tmp2_ = NULL;
+ PhotoTransformationState* _tmp0_;
+ PhotoPhotoTransformationStateImpl* _tmp1_;
+ PhotoPhotoTransformationStateImpl* _tmp2_;
Orientation saved_orientation = 0;
- PhotoPhotoTransformationStateImpl* _tmp3_ = NULL;
- Orientation _tmp4_ = 0;
+ PhotoPhotoTransformationStateImpl* _tmp3_;
+ Orientation _tmp4_;
GeeHashMap* saved_transformations = NULL;
- PhotoPhotoTransformationStateImpl* _tmp5_ = NULL;
- GeeHashMap* _tmp6_ = NULL;
+ PhotoPhotoTransformationStateImpl* _tmp5_;
+ GeeHashMap* _tmp6_;
PixelTransformer* saved_transformer = NULL;
- PhotoPhotoTransformationStateImpl* _tmp7_ = NULL;
- PixelTransformer* _tmp8_ = NULL;
+ PhotoPhotoTransformationStateImpl* _tmp7_;
+ PixelTransformer* _tmp8_;
PixelTransformationBundle* saved_adjustments = NULL;
- PhotoPhotoTransformationStateImpl* _tmp9_ = NULL;
- PixelTransformationBundle* _tmp10_ = NULL;
+ PhotoPhotoTransformationStateImpl* _tmp9_;
+ PixelTransformationBundle* _tmp10_;
gboolean committed = FALSE;
- gboolean _tmp31_ = FALSE;
+ gboolean _tmp31_;
GError * _inner_error_ = NULL;
#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -21492,7 +21496,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
_g_object_unref0 (state_impl);
#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21494 "Photo.c"
+#line 21498 "Photo.c"
}
#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = state_impl;
@@ -21518,23 +21522,23 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
_tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_);
#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
saved_adjustments = _tmp10_;
-#line 21520 "Photo.c"
+#line 21524 "Photo.c"
{
- PhotoRow* _tmp11_ = NULL;
+ PhotoRow* _tmp11_;
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->row;
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21527 "Photo.c"
- {
- PhotoTable* _tmp12_ = NULL;
- PhotoTable* _tmp13_ = NULL;
- PhotoRow* _tmp14_ = NULL;
- PhotoID _tmp15_ = {0};
- Orientation _tmp16_ = 0;
- GeeHashMap* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
- gboolean _tmp19_ = FALSE;
+#line 21531 "Photo.c"
+ {
+ PhotoTable* _tmp12_;
+ PhotoTable* _tmp13_;
+ PhotoRow* _tmp14_;
+ PhotoID _tmp15_;
+ Orientation _tmp16_;
+ GeeHashMap* _tmp17_;
+ gboolean _tmp18_;
+ gboolean _tmp19_;
#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_table_get_instance ();
#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21557,16 +21561,16 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
_tmp19_ = committed;
#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp19_) {
-#line 21559 "Photo.c"
- PhotoRow* _tmp20_ = NULL;
- Orientation _tmp21_ = 0;
- PhotoRow* _tmp22_ = NULL;
- GeeHashMap* _tmp23_ = NULL;
- GeeHashMap* _tmp24_ = NULL;
- PixelTransformer* _tmp25_ = NULL;
- PixelTransformer* _tmp26_ = NULL;
- PixelTransformationBundle* _tmp27_ = NULL;
- PixelTransformationBundle* _tmp28_ = NULL;
+#line 21563 "Photo.c"
+ PhotoRow* _tmp20_;
+ Orientation _tmp21_;
+ PhotoRow* _tmp22_;
+ GeeHashMap* _tmp23_;
+ GeeHashMap* _tmp24_;
+ PixelTransformer* _tmp25_;
+ PixelTransformer* _tmp26_;
+ PixelTransformationBundle* _tmp27_;
+ PixelTransformationBundle* _tmp28_;
#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = self->row;
#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21599,21 +21603,21 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
_pixel_transformation_bundle_unref0 (self->priv->adjustments);
#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->adjustments = _tmp28_;
-#line 21601 "Photo.c"
+#line 21605 "Photo.c"
}
}
- __finally369:
+ __finally370:
{
- PhotoRow* _tmp29_ = NULL;
+ PhotoRow* _tmp29_;
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = self->row;
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21611 "Photo.c"
+#line 21615 "Photo.c"
}
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21615 "Photo.c"
+#line 21619 "Photo.c"
gboolean _tmp30_ = FALSE;
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformation_bundle_unref0 (saved_adjustments);
@@ -21629,16 +21633,16 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
g_clear_error (&_inner_error_);
#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp30_;
-#line 21631 "Photo.c"
+#line 21635 "Photo.c"
}
}
#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = committed;
#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp31_) {
-#line 21638 "Photo.c"
- Alteration* _tmp32_ = NULL;
- Alteration* _tmp33_ = NULL;
+#line 21642 "Photo.c"
+ Alteration* _tmp32_;
+ Alteration* _tmp33_;
#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = alteration_new ("image", "transformation-state");
#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21647,7 +21651,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_);
#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp33_);
-#line 21649 "Photo.c"
+#line 21653 "Photo.c"
}
#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
result = committed;
@@ -21661,7 +21665,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
_g_object_unref0 (state_impl);
#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21663 "Photo.c"
+#line 21667 "Photo.c"
}
@@ -21670,38 +21674,38 @@ void photo_remove_all_transformations (Photo* self) {
g_return_if_fail (IS_PHOTO (self));
#line 2805 "/home/jens/Source/shotwell/src/Photo.vala"
photo_internal_remove_all_transformations (self, TRUE);
-#line 21672 "Photo.c"
+#line 21676 "Photo.c"
}
static void photo_internal_remove_all_transformations (Photo* self, gboolean notify) {
gboolean is_altered = FALSE;
gboolean _tmp21_ = FALSE;
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp22_;
GError * _inner_error_ = NULL;
#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
is_altered = FALSE;
-#line 21685 "Photo.c"
+#line 21689 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21692 "Photo.c"
- {
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- PhotoRow* _tmp3_ = NULL;
- PhotoID _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
- PhotoRow* _tmp6_ = NULL;
- PhotoRow* _tmp7_ = NULL;
- Orientation _tmp8_ = 0;
- BackingPhotoRow* _tmp9_ = NULL;
- Orientation _tmp10_ = 0;
+#line 21696 "Photo.c"
+ {
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
+ PhotoRow* _tmp3_;
+ PhotoID _tmp4_;
+ gboolean _tmp5_;
+ PhotoRow* _tmp6_;
+ PhotoRow* _tmp7_;
+ Orientation _tmp8_;
+ BackingPhotoRow* _tmp9_;
+ Orientation _tmp10_;
#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_table_get_instance ();
#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21740,16 +21744,16 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
_tmp10_ = _tmp9_->original_orientation;
#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ != _tmp10_) {
-#line 21742 "Photo.c"
- PhotoTable* _tmp11_ = NULL;
- PhotoTable* _tmp12_ = NULL;
- PhotoRow* _tmp13_ = NULL;
- PhotoID _tmp14_ = {0};
- BackingPhotoRow* _tmp15_ = NULL;
- Orientation _tmp16_ = 0;
- PhotoRow* _tmp17_ = NULL;
- BackingPhotoRow* _tmp18_ = NULL;
- Orientation _tmp19_ = 0;
+#line 21746 "Photo.c"
+ PhotoTable* _tmp11_;
+ PhotoTable* _tmp12_;
+ PhotoRow* _tmp13_;
+ PhotoID _tmp14_;
+ BackingPhotoRow* _tmp15_;
+ Orientation _tmp16_;
+ PhotoRow* _tmp17_;
+ BackingPhotoRow* _tmp18_;
+ Orientation _tmp19_;
#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = photo_table_get_instance ();
#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21776,17 +21780,17 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
_tmp17_->orientation = _tmp19_;
#line 2821 "/home/jens/Source/shotwell/src/Photo.vala"
is_altered = TRUE;
-#line 21778 "Photo.c"
+#line 21782 "Photo.c"
}
}
- __finally370:
+ __finally371:
{
- PhotoRow* _tmp20_ = NULL;
+ PhotoRow* _tmp20_;
#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = self->row;
#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21788 "Photo.c"
+#line 21792 "Photo.c"
}
#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21796,30 +21800,30 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
g_clear_error (&_inner_error_);
#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 21798 "Photo.c"
+#line 21802 "Photo.c"
}
}
#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = is_altered;
#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_) {
-#line 21805 "Photo.c"
- gboolean _tmp23_ = FALSE;
+#line 21809 "Photo.c"
+ gboolean _tmp23_;
#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = notify;
#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = _tmp23_;
-#line 21811 "Photo.c"
+#line 21815 "Photo.c"
} else {
#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = FALSE;
-#line 21815 "Photo.c"
+#line 21819 "Photo.c"
}
#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_) {
-#line 21819 "Photo.c"
- Alteration* _tmp24_ = NULL;
- Alteration* _tmp25_ = NULL;
+#line 21823 "Photo.c"
+ Alteration* _tmp24_;
+ Alteration* _tmp25_;
#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = alteration_new ("image", "revert");
#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21828,7 +21832,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp25_);
-#line 21830 "Photo.c"
+#line 21834 "Photo.c"
}
}
@@ -21838,44 +21842,44 @@ Orientation photo_get_original_orientation (Photo* self) {
GError * _inner_error_ = NULL;
#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21840 "Photo.c"
+#line 21844 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21847 "Photo.c"
+#line 21851 "Photo.c"
{
- BackingPhotoRow* _tmp1_ = NULL;
- Orientation _tmp2_ = 0;
+ BackingPhotoRow* _tmp1_;
+ Orientation _tmp2_;
#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->backing_photo_row;
#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->original_orientation;
#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 21857 "Photo.c"
+#line 21861 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21864 "Photo.c"
+#line 21868 "Photo.c"
}
#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21868 "Photo.c"
+#line 21872 "Photo.c"
}
- __finally371:
+ __finally372:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21877 "Photo.c"
+#line 21881 "Photo.c"
}
#line 2830 "/home/jens/Source/shotwell/src/Photo.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);
@@ -21883,7 +21887,7 @@ Orientation photo_get_original_orientation (Photo* self) {
g_clear_error (&_inner_error_);
#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 21885 "Photo.c"
+#line 21889 "Photo.c"
}
}
@@ -21893,44 +21897,44 @@ Orientation photo_get_orientation (Photo* self) {
GError * _inner_error_ = NULL;
#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21895 "Photo.c"
+#line 21899 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21902 "Photo.c"
+#line 21906 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- Orientation _tmp2_ = 0;
+ PhotoRow* _tmp1_;
+ Orientation _tmp2_;
#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->orientation;
#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp2_;
-#line 21912 "Photo.c"
+#line 21916 "Photo.c"
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21919 "Photo.c"
+#line 21923 "Photo.c"
}
#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 21923 "Photo.c"
+#line 21927 "Photo.c"
}
- __finally372:
+ __finally373:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21932 "Photo.c"
+#line 21936 "Photo.c"
}
#line 2836 "/home/jens/Source/shotwell/src/Photo.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);
@@ -21938,7 +21942,7 @@ Orientation photo_get_orientation (Photo* self) {
g_clear_error (&_inner_error_);
#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
return 0;
-#line 21940 "Photo.c"
+#line 21944 "Photo.c"
}
}
@@ -21946,24 +21950,24 @@ Orientation photo_get_orientation (Photo* self) {
gboolean photo_set_orientation (Photo* self, Orientation orientation) {
gboolean result = FALSE;
gboolean committed = FALSE;
- gboolean _tmp15_ = FALSE;
+ gboolean _tmp15_;
GError * _inner_error_ = NULL;
#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
committed = FALSE;
-#line 21954 "Photo.c"
+#line 21958 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21961 "Photo.c"
+#line 21965 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- Orientation _tmp2_ = 0;
- Orientation _tmp3_ = 0;
+ PhotoRow* _tmp1_;
+ Orientation _tmp2_;
+ Orientation _tmp3_;
#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21972,14 +21976,14 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
_tmp3_ = orientation;
#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != _tmp3_) {
-#line 21974 "Photo.c"
- PhotoTable* _tmp4_ = NULL;
- PhotoTable* _tmp5_ = NULL;
- PhotoRow* _tmp6_ = NULL;
- PhotoID _tmp7_ = {0};
- Orientation _tmp8_ = 0;
- gboolean _tmp9_ = FALSE;
- gboolean _tmp10_ = FALSE;
+#line 21978 "Photo.c"
+ PhotoTable* _tmp4_;
+ PhotoTable* _tmp5_;
+ PhotoRow* _tmp6_;
+ PhotoID _tmp7_;
+ Orientation _tmp8_;
+ gboolean _tmp9_;
+ gboolean _tmp10_;
#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_table_get_instance ();
#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22000,31 +22004,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
_tmp10_ = committed;
#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp10_) {
-#line 22002 "Photo.c"
- PhotoRow* _tmp11_ = NULL;
- Orientation _tmp12_ = 0;
+#line 22006 "Photo.c"
+ PhotoRow* _tmp11_;
+ Orientation _tmp12_;
#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->row;
#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = orientation;
#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_->orientation = _tmp12_;
-#line 22011 "Photo.c"
+#line 22015 "Photo.c"
}
}
}
- __finally373:
+ __finally374:
{
- PhotoRow* _tmp13_ = NULL;
+ PhotoRow* _tmp13_;
#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->row;
#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22022 "Photo.c"
+#line 22026 "Photo.c"
}
#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 22026 "Photo.c"
+#line 22030 "Photo.c"
gboolean _tmp14_ = FALSE;
#line 2843 "/home/jens/Source/shotwell/src/Photo.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);
@@ -22032,16 +22036,16 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
g_clear_error (&_inner_error_);
#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp14_;
-#line 22034 "Photo.c"
+#line 22038 "Photo.c"
}
}
#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = committed;
#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_) {
-#line 22041 "Photo.c"
- Alteration* _tmp16_ = NULL;
- Alteration* _tmp17_ = NULL;
+#line 22045 "Photo.c"
+ Alteration* _tmp16_;
+ Alteration* _tmp17_;
#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = alteration_new ("image", "orientation");
#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22050,19 +22054,19 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_);
#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp17_);
-#line 22052 "Photo.c"
+#line 22056 "Photo.c"
}
#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
result = committed;
#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22058 "Photo.c"
+#line 22062 "Photo.c"
}
gboolean photo_check_can_rotate (Photo* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2857 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22071,23 +22075,23 @@ gboolean photo_check_can_rotate (Photo* self) {
result = _tmp0_;
#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22073 "Photo.c"
+#line 22077 "Photo.c"
}
static void photo_real_rotate (Photo* self, Rotation rotation) {
GError * _inner_error_ = NULL;
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22085 "Photo.c"
+#line 22089 "Photo.c"
{
- Orientation _tmp1_ = 0;
- Rotation _tmp2_ = 0;
- Orientation _tmp3_ = 0;
+ Orientation _tmp1_;
+ Rotation _tmp2_;
+ Orientation _tmp3_;
#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_get_orientation (self);
#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22096,16 +22100,16 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
_tmp3_ = orientation_perform (_tmp1_, _tmp2_);
#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_orientation (self, _tmp3_);
-#line 22098 "Photo.c"
+#line 22102 "Photo.c"
}
- __finally374:
+ __finally375:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22107 "Photo.c"
+#line 22111 "Photo.c"
}
#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22115,7 +22119,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
g_clear_error (&_inner_error_);
#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 22117 "Photo.c"
+#line 22121 "Photo.c"
}
}
}
@@ -22126,7 +22130,7 @@ void photo_rotate (Photo* self, Rotation rotation) {
g_return_if_fail (IS_PHOTO (self));
#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->rotate (self, rotation);
-#line 22128 "Photo.c"
+#line 22132 "Photo.c"
}
@@ -22137,30 +22141,30 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (name != NULL, FALSE);
-#line 22139 "Photo.c"
+#line 22143 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp10_ = FALSE;
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22147 "Photo.c"
+#line 22151 "Photo.c"
{
gboolean _tmp1_ = FALSE;
- PhotoRow* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
+ PhotoRow* _tmp2_;
+ GeeHashMap* _tmp3_;
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp2_->transformations;
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp3_ != NULL) {
-#line 22158 "Photo.c"
- PhotoRow* _tmp4_ = NULL;
- GeeHashMap* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 22162 "Photo.c"
+ PhotoRow* _tmp4_;
+ GeeHashMap* _tmp5_;
+ const gchar* _tmp6_;
+ gboolean _tmp7_;
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22171,35 +22175,35 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
_tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp7_;
-#line 22173 "Photo.c"
+#line 22177 "Photo.c"
} else {
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 22177 "Photo.c"
+#line 22181 "Photo.c"
}
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp1_;
-#line 22181 "Photo.c"
+#line 22185 "Photo.c"
{
- PhotoRow* _tmp8_ = NULL;
+ PhotoRow* _tmp8_;
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->row;
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22188 "Photo.c"
+#line 22192 "Photo.c"
}
#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22192 "Photo.c"
+#line 22196 "Photo.c"
}
- __finally375:
+ __finally376:
{
- PhotoRow* _tmp9_ = NULL;
+ PhotoRow* _tmp9_;
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22201 "Photo.c"
+#line 22205 "Photo.c"
}
#line 2868 "/home/jens/Source/shotwell/src/Photo.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);
@@ -22207,7 +22211,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
g_clear_error (&_inner_error_);
#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp10_;
-#line 22209 "Photo.c"
+#line 22213 "Photo.c"
}
}
@@ -22222,29 +22226,29 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
g_return_val_if_fail (name != NULL, NULL);
#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
map = NULL;
-#line 22224 "Photo.c"
+#line 22228 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22231 "Photo.c"
+#line 22235 "Photo.c"
{
- PhotoRow* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
+ PhotoRow* _tmp1_;
+ GeeHashMap* _tmp2_;
#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->transformations;
#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 22241 "Photo.c"
- PhotoRow* _tmp3_ = NULL;
- GeeHashMap* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- KeyValueMap* _tmp7_ = NULL;
+#line 22245 "Photo.c"
+ PhotoRow* _tmp3_;
+ GeeHashMap* _tmp4_;
+ const gchar* _tmp5_;
+ gpointer _tmp6_;
+ KeyValueMap* _tmp7_;
#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22261,9 +22265,9 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
_tmp7_ = map;
#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_ != NULL) {
-#line 22263 "Photo.c"
- KeyValueMap* _tmp8_ = NULL;
- KeyValueMap* _tmp9_ = NULL;
+#line 22267 "Photo.c"
+ KeyValueMap* _tmp8_;
+ KeyValueMap* _tmp9_;
#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = map;
#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22272,18 +22276,18 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
_key_value_map_unref0 (map);
#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
map = _tmp9_;
-#line 22274 "Photo.c"
+#line 22278 "Photo.c"
}
}
}
- __finally376:
+ __finally377:
{
- PhotoRow* _tmp10_ = NULL;
+ PhotoRow* _tmp10_;
#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->row;
#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22285 "Photo.c"
+#line 22289 "Photo.c"
}
#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22295,14 +22299,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
g_clear_error (&_inner_error_);
#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 22297 "Photo.c"
+#line 22301 "Photo.c"
}
}
#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
result = map;
#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22304 "Photo.c"
+#line 22308 "Photo.c"
}
@@ -22313,40 +22317,40 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE);
-#line 22315 "Photo.c"
+#line 22319 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp20_ = FALSE;
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22323 "Photo.c"
- {
- PhotoRow* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
- PhotoRow* _tmp5_ = NULL;
- GeeHashMap* _tmp6_ = NULL;
- KeyValueMap* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- KeyValueMap* _tmp10_ = NULL;
- PhotoTable* _tmp11_ = NULL;
- PhotoTable* _tmp12_ = NULL;
- PhotoRow* _tmp13_ = NULL;
- PhotoID _tmp14_ = {0};
- KeyValueMap* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
- gboolean _tmp17_ = FALSE;
+#line 22327 "Photo.c"
+ {
+ PhotoRow* _tmp1_;
+ GeeHashMap* _tmp2_;
+ PhotoRow* _tmp5_;
+ GeeHashMap* _tmp6_;
+ KeyValueMap* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ KeyValueMap* _tmp10_;
+ PhotoTable* _tmp11_;
+ PhotoTable* _tmp12_;
+ PhotoRow* _tmp13_;
+ PhotoID _tmp14_;
+ KeyValueMap* _tmp15_;
+ gboolean _tmp16_;
+ gboolean _tmp17_;
#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->transformations;
#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ == NULL) {
-#line 22346 "Photo.c"
- PhotoRow* _tmp3_ = NULL;
- GeeHashMap* _tmp4_ = NULL;
+#line 22350 "Photo.c"
+ PhotoRow* _tmp3_;
+ GeeHashMap* _tmp4_;
#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22355,7 +22359,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
_g_object_unref0 (_tmp3_->transformations);
#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_->transformations = _tmp4_;
-#line 22357 "Photo.c"
+#line 22361 "Photo.c"
}
#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
@@ -22391,27 +22395,27 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
_database_table_unref0 (_tmp12_);
#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp17_;
-#line 22393 "Photo.c"
+#line 22397 "Photo.c"
{
- PhotoRow* _tmp18_ = NULL;
+ PhotoRow* _tmp18_;
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = self->row;
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22400 "Photo.c"
+#line 22404 "Photo.c"
}
#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22404 "Photo.c"
+#line 22408 "Photo.c"
}
- __finally377:
+ __finally378:
{
- PhotoRow* _tmp19_ = NULL;
+ PhotoRow* _tmp19_;
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22413 "Photo.c"
+#line 22417 "Photo.c"
}
#line 2890 "/home/jens/Source/shotwell/src/Photo.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);
@@ -22419,7 +22423,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
g_clear_error (&_inner_error_);
#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp20_;
-#line 22421 "Photo.c"
+#line 22425 "Photo.c"
}
}
@@ -22429,44 +22433,44 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
gboolean altered_cache = FALSE;
gboolean altered_persistent = FALSE;
gboolean _tmp20_ = FALSE;
- gboolean _tmp21_ = FALSE;
+ gboolean _tmp21_;
GError * _inner_error_ = NULL;
#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (name != NULL, FALSE);
-#line 22437 "Photo.c"
+#line 22441 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22444 "Photo.c"
- {
- PhotoRow* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
- PhotoTable* _tmp12_ = NULL;
- PhotoTable* _tmp13_ = NULL;
- PhotoRow* _tmp14_ = NULL;
- PhotoID _tmp15_ = {0};
- const gchar* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
+#line 22448 "Photo.c"
+ {
+ PhotoRow* _tmp1_;
+ GeeHashMap* _tmp2_;
+ PhotoTable* _tmp12_;
+ PhotoTable* _tmp13_;
+ PhotoRow* _tmp14_;
+ PhotoID _tmp15_;
+ const gchar* _tmp16_;
+ gboolean _tmp17_;
#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->row;
#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->transformations;
#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 22460 "Photo.c"
- PhotoRow* _tmp3_ = NULL;
- GeeHashMap* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- PhotoRow* _tmp7_ = NULL;
- GeeHashMap* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
+#line 22464 "Photo.c"
+ PhotoRow* _tmp3_;
+ GeeHashMap* _tmp4_;
+ const gchar* _tmp5_;
+ gboolean _tmp6_;
+ PhotoRow* _tmp7_;
+ GeeHashMap* _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22487,20 +22491,20 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
_tmp10_ = _tmp9_;
#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp10_ == 0) {
-#line 22489 "Photo.c"
- PhotoRow* _tmp11_ = NULL;
+#line 22493 "Photo.c"
+ PhotoRow* _tmp11_;
#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->row;
#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp11_->transformations);
#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_->transformations = NULL;
-#line 22497 "Photo.c"
+#line 22501 "Photo.c"
}
} else {
#line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
altered_cache = FALSE;
-#line 22502 "Photo.c"
+#line 22506 "Photo.c"
}
#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_table_get_instance ();
@@ -22518,20 +22522,20 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
altered_persistent = _tmp17_;
#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
_database_table_unref0 (_tmp13_);
-#line 22520 "Photo.c"
+#line 22524 "Photo.c"
}
- __finally378:
+ __finally379:
{
- PhotoRow* _tmp18_ = NULL;
+ PhotoRow* _tmp18_;
#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = self->row;
#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22529 "Photo.c"
+#line 22533 "Photo.c"
}
#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 22533 "Photo.c"
+#line 22537 "Photo.c"
gboolean _tmp19_ = FALSE;
#line 2902 "/home/jens/Source/shotwell/src/Photo.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);
@@ -22539,7 +22543,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
g_clear_error (&_inner_error_);
#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp19_;
-#line 22541 "Photo.c"
+#line 22545 "Photo.c"
}
}
#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22548,23 +22552,23 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
if (_tmp21_) {
#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = TRUE;
-#line 22550 "Photo.c"
+#line 22554 "Photo.c"
} else {
#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = altered_persistent;
-#line 22554 "Photo.c"
+#line 22558 "Photo.c"
}
#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp20_;
#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22560 "Photo.c"
+#line 22564 "Photo.c"
}
gboolean photo_has_crop (Photo* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2918 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22573,7 +22577,7 @@ gboolean photo_has_crop (Photo* self) {
result = _tmp0_;
#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22575 "Photo.c"
+#line 22579 "Photo.c"
}
@@ -22581,28 +22585,28 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
Box _vala_crop = {0};
gboolean result = FALSE;
KeyValueMap* map = NULL;
- KeyValueMap* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
+ KeyValueMap* _tmp0_;
+ KeyValueMap* _tmp1_;
gint left = 0;
- KeyValueMap* _tmp2_ = NULL;
- gint _tmp3_ = 0;
+ KeyValueMap* _tmp2_;
+ gint _tmp3_;
gint top = 0;
- KeyValueMap* _tmp4_ = NULL;
- gint _tmp5_ = 0;
+ KeyValueMap* _tmp4_;
+ gint _tmp5_;
gint right = 0;
- KeyValueMap* _tmp6_ = NULL;
- gint _tmp7_ = 0;
+ KeyValueMap* _tmp6_;
+ gint _tmp7_;
gint bottom = 0;
- KeyValueMap* _tmp8_ = NULL;
- gint _tmp9_ = 0;
+ KeyValueMap* _tmp8_;
+ gint _tmp9_;
gboolean _tmp10_ = FALSE;
gboolean _tmp11_ = FALSE;
gboolean _tmp12_ = FALSE;
- gint _tmp13_ = 0;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+ gint _tmp13_;
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22623,11 +22627,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
if (crop) {
#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
*crop = _vala_crop;
-#line 22625 "Photo.c"
+#line 22629 "Photo.c"
}
#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22629 "Photo.c"
+#line 22633 "Photo.c"
}
#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = map;
@@ -22659,40 +22663,40 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
if (_tmp13_ == -1) {
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = TRUE;
-#line 22661 "Photo.c"
+#line 22665 "Photo.c"
} else {
- gint _tmp14_ = 0;
+ gint _tmp14_;
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = top;
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _tmp14_ == -1;
-#line 22668 "Photo.c"
+#line 22672 "Photo.c"
}
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = TRUE;
-#line 22674 "Photo.c"
+#line 22678 "Photo.c"
} else {
- gint _tmp15_ = 0;
+ gint _tmp15_;
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = right;
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _tmp15_ == -1;
-#line 22681 "Photo.c"
+#line 22685 "Photo.c"
}
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = TRUE;
-#line 22687 "Photo.c"
+#line 22691 "Photo.c"
} else {
- gint _tmp16_ = 0;
+ gint _tmp16_;
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = bottom;
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = _tmp16_ == -1;
-#line 22694 "Photo.c"
+#line 22698 "Photo.c"
}
#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp10_) {
@@ -22704,11 +22708,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
if (crop) {
#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
*crop = _vala_crop;
-#line 22706 "Photo.c"
+#line 22710 "Photo.c"
}
#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22710 "Photo.c"
+#line 22714 "Photo.c"
}
#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = left;
@@ -22728,31 +22732,31 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
if (crop) {
#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
*crop = _vala_crop;
-#line 22730 "Photo.c"
+#line 22734 "Photo.c"
}
#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22734 "Photo.c"
+#line 22738 "Photo.c"
}
static void photo_set_raw_crop (Photo* self, Box* crop) {
KeyValueMap* map = NULL;
- KeyValueMap* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
- Box _tmp2_ = {0};
- gint _tmp3_ = 0;
- KeyValueMap* _tmp4_ = NULL;
- Box _tmp5_ = {0};
- gint _tmp6_ = 0;
- KeyValueMap* _tmp7_ = NULL;
- Box _tmp8_ = {0};
- gint _tmp9_ = 0;
- KeyValueMap* _tmp10_ = NULL;
- Box _tmp11_ = {0};
- gint _tmp12_ = 0;
- KeyValueMap* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+ KeyValueMap* _tmp0_;
+ KeyValueMap* _tmp1_;
+ Box _tmp2_;
+ gint _tmp3_;
+ KeyValueMap* _tmp4_;
+ Box _tmp5_;
+ gint _tmp6_;
+ KeyValueMap* _tmp7_;
+ Box _tmp8_;
+ gint _tmp9_;
+ KeyValueMap* _tmp10_;
+ Box _tmp11_;
+ gint _tmp12_;
+ KeyValueMap* _tmp13_;
+ gboolean _tmp14_;
#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22799,9 +22803,9 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
_tmp14_ = photo_set_transformation (self, _tmp13_);
#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_) {
-#line 22801 "Photo.c"
- Alteration* _tmp15_ = NULL;
- Alteration* _tmp16_ = NULL;
+#line 22805 "Photo.c"
+ Alteration* _tmp15_;
+ Alteration* _tmp16_;
#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = alteration_new ("image", "crop");
#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22810,11 +22814,11 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp16_);
-#line 22812 "Photo.c"
+#line 22816 "Photo.c"
}
#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
_key_value_map_unref0 (map);
-#line 22816 "Photo.c"
+#line 22820 "Photo.c"
}
@@ -22822,10 +22826,10 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
gdouble _vala_angle = 0.0;
gboolean result = FALSE;
KeyValueMap* map = NULL;
- KeyValueMap* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
- KeyValueMap* _tmp2_ = NULL;
- gdouble _tmp3_ = 0.0;
+ KeyValueMap* _tmp0_;
+ KeyValueMap* _tmp1_;
+ KeyValueMap* _tmp2_;
+ gdouble _tmp3_;
#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22846,11 +22850,11 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
if (angle) {
#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
*angle = _vala_angle;
-#line 22848 "Photo.c"
+#line 22852 "Photo.c"
}
#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22852 "Photo.c"
+#line 22856 "Photo.c"
}
#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = map;
@@ -22866,21 +22870,21 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
if (angle) {
#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
*angle = _vala_angle;
-#line 22868 "Photo.c"
+#line 22872 "Photo.c"
}
#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22872 "Photo.c"
+#line 22876 "Photo.c"
}
static void photo_set_raw_straighten (Photo* self, gdouble theta) {
KeyValueMap* map = NULL;
- KeyValueMap* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
- KeyValueMap* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ KeyValueMap* _tmp0_;
+ KeyValueMap* _tmp1_;
+ gdouble _tmp2_;
+ KeyValueMap* _tmp3_;
+ gboolean _tmp4_;
#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22899,9 +22903,9 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
_tmp4_ = photo_set_transformation (self, _tmp3_);
#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp4_) {
-#line 22901 "Photo.c"
- Alteration* _tmp5_ = NULL;
- Alteration* _tmp6_ = NULL;
+#line 22905 "Photo.c"
+ Alteration* _tmp5_;
+ Alteration* _tmp6_;
#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = alteration_new ("image", "straighten");
#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22910,32 +22914,32 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_);
#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp6_);
-#line 22912 "Photo.c"
+#line 22916 "Photo.c"
}
#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
_key_value_map_unref0 (map);
-#line 22916 "Photo.c"
+#line 22920 "Photo.c"
}
static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1) {
EditingToolsRedeyeInstance* result = NULL;
KeyValueMap* map = NULL;
- KeyValueMap* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
+ KeyValueMap* _tmp0_;
+ KeyValueMap* _tmp1_;
gint num_points = 0;
- KeyValueMap* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+ KeyValueMap* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
EditingToolsRedeyeInstance* res = NULL;
- gint _tmp7_ = 0;
- EditingToolsRedeyeInstance* _tmp8_ = NULL;
- gint res_length1 = 0;
- gint _res_size_ = 0;
+ gint _tmp7_;
+ EditingToolsRedeyeInstance* _tmp8_;
+ gint res_length1;
+ gint _res_size_;
GdkPoint default_point = {0};
GdkPoint _tmp9_ = {0};
- EditingToolsRedeyeInstance* _tmp47_ = NULL;
- gint _tmp47__length1 = 0;
+ EditingToolsRedeyeInstance* _tmp47_;
+ gint _tmp47__length1;
#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22946,10 +22950,10 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
_tmp1_ = map;
#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ == NULL) {
-#line 22948 "Photo.c"
- EditingToolsRedeyeInstance* _tmp2_ = NULL;
- EditingToolsRedeyeInstance* _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
+#line 22952 "Photo.c"
+ EditingToolsRedeyeInstance* _tmp2_;
+ EditingToolsRedeyeInstance* _tmp3_;
+ gint _tmp3__length1;
#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0);
#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22960,7 +22964,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
if (result_length1) {
#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
*result_length1 = _tmp3__length1;
-#line 22962 "Photo.c"
+#line 22966 "Photo.c"
}
#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp3_;
@@ -22968,7 +22972,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
_key_value_map_unref0 (map);
#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 22970 "Photo.c"
+#line 22974 "Photo.c"
}
#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = map;
@@ -22998,70 +23002,70 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
default_point.x = -1;
#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
default_point.y = -1;
-#line 23000 "Photo.c"
+#line 23004 "Photo.c"
{
gint i = 0;
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
i = 0;
-#line 23005 "Photo.c"
+#line 23009 "Photo.c"
{
gboolean _tmp10_ = FALSE;
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = TRUE;
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 23012 "Photo.c"
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
+#line 23016 "Photo.c"
+ gint _tmp12_;
+ gint _tmp13_;
gchar* center_key = NULL;
- gint _tmp14_ = 0;
- gchar* _tmp15_ = NULL;
+ gint _tmp14_;
+ gchar* _tmp15_;
gchar* radius_key = NULL;
- gint _tmp16_ = 0;
- gchar* _tmp17_ = NULL;
- EditingToolsRedeyeInstance* _tmp18_ = NULL;
- gint _tmp18__length1 = 0;
- gint _tmp19_ = 0;
- KeyValueMap* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- GdkPoint _tmp22_ = {0};
+ gint _tmp16_;
+ gchar* _tmp17_;
+ EditingToolsRedeyeInstance* _tmp18_;
+ gint _tmp18__length1;
+ gint _tmp19_;
+ KeyValueMap* _tmp20_;
+ const gchar* _tmp21_;
+ GdkPoint _tmp22_;
GdkPoint _tmp23_ = {0};
- EditingToolsRedeyeInstance* _tmp24_ = NULL;
- gint _tmp24__length1 = 0;
- gint _tmp25_ = 0;
- EditingToolsRedeyeInstance _tmp26_ = {0};
- GdkPoint _tmp27_ = {0};
- gint _tmp28_ = 0;
- GdkPoint _tmp29_ = {0};
- gint _tmp30_ = 0;
- EditingToolsRedeyeInstance* _tmp31_ = NULL;
- gint _tmp31__length1 = 0;
- gint _tmp32_ = 0;
- EditingToolsRedeyeInstance _tmp33_ = {0};
- GdkPoint _tmp34_ = {0};
- gint _tmp35_ = 0;
- GdkPoint _tmp36_ = {0};
- gint _tmp37_ = 0;
- EditingToolsRedeyeInstance* _tmp38_ = NULL;
- gint _tmp38__length1 = 0;
- gint _tmp39_ = 0;
- KeyValueMap* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
- gint _tmp42_ = 0;
- EditingToolsRedeyeInstance* _tmp43_ = NULL;
- gint _tmp43__length1 = 0;
- gint _tmp44_ = 0;
- EditingToolsRedeyeInstance _tmp45_ = {0};
- gint _tmp46_ = 0;
+ EditingToolsRedeyeInstance* _tmp24_;
+ gint _tmp24__length1;
+ gint _tmp25_;
+ EditingToolsRedeyeInstance _tmp26_;
+ GdkPoint _tmp27_;
+ gint _tmp28_;
+ GdkPoint _tmp29_;
+ gint _tmp30_;
+ EditingToolsRedeyeInstance* _tmp31_;
+ gint _tmp31__length1;
+ gint _tmp32_;
+ EditingToolsRedeyeInstance _tmp33_;
+ GdkPoint _tmp34_;
+ gint _tmp35_;
+ GdkPoint _tmp36_;
+ gint _tmp37_;
+ EditingToolsRedeyeInstance* _tmp38_;
+ gint _tmp38__length1;
+ gint _tmp39_;
+ KeyValueMap* _tmp40_;
+ const gchar* _tmp41_;
+ gint _tmp42_;
+ EditingToolsRedeyeInstance* _tmp43_;
+ gint _tmp43__length1;
+ gint _tmp44_;
+ EditingToolsRedeyeInstance _tmp45_;
+ gint _tmp46_;
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp10_) {
-#line 23057 "Photo.c"
- gint _tmp11_ = 0;
+#line 23061 "Photo.c"
+ gint _tmp11_;
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = i;
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
i = _tmp11_ + 1;
-#line 23063 "Photo.c"
+#line 23067 "Photo.c"
}
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = FALSE;
@@ -23073,7 +23077,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
if (!(_tmp12_ < _tmp13_)) {
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 23075 "Photo.c"
+#line 23079 "Photo.c"
}
#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = i;
@@ -23169,7 +23173,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
_g_free0 (radius_key);
#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (center_key);
-#line 23171 "Photo.c"
+#line 23175 "Photo.c"
}
}
}
@@ -23181,7 +23185,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
if (result_length1) {
#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
*result_length1 = _tmp47__length1;
-#line 23183 "Photo.c"
+#line 23187 "Photo.c"
}
#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp47_;
@@ -23189,13 +23193,13 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
_key_value_map_unref0 (map);
#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23191 "Photo.c"
+#line 23195 "Photo.c"
}
gboolean photo_has_redeye_transformations (Photo* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23204,37 +23208,37 @@ gboolean photo_has_redeye_transformations (Photo* self) {
result = _tmp0_;
#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23206 "Photo.c"
+#line 23210 "Photo.c"
}
void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye) {
KeyValueMap* map = NULL;
- KeyValueMap* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
+ KeyValueMap* _tmp0_;
+ KeyValueMap* _tmp1_;
gint num_points = 0;
- KeyValueMap* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+ KeyValueMap* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
gchar* radius_key = NULL;
- gint _tmp8_ = 0;
- gchar* _tmp9_ = NULL;
+ gint _tmp8_;
+ gchar* _tmp9_;
gchar* center_key = NULL;
- gint _tmp10_ = 0;
- gchar* _tmp11_ = NULL;
- KeyValueMap* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- EditingToolsRedeyeInstance _tmp14_ = {0};
- gint _tmp15_ = 0;
- KeyValueMap* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- EditingToolsRedeyeInstance _tmp18_ = {0};
- GdkPoint _tmp19_ = {0};
- KeyValueMap* _tmp20_ = NULL;
- gint _tmp21_ = 0;
- KeyValueMap* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
+ gint _tmp10_;
+ gchar* _tmp11_;
+ KeyValueMap* _tmp12_;
+ const gchar* _tmp13_;
+ EditingToolsRedeyeInstance _tmp14_;
+ gint _tmp15_;
+ KeyValueMap* _tmp16_;
+ const gchar* _tmp17_;
+ EditingToolsRedeyeInstance _tmp18_;
+ GdkPoint _tmp19_;
+ KeyValueMap* _tmp20_;
+ gint _tmp21_;
+ KeyValueMap* _tmp22_;
+ gboolean _tmp23_;
#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23247,9 +23251,9 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
_tmp1_ = map;
#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ == NULL) {
-#line 23249 "Photo.c"
- KeyValueMap* _tmp2_ = NULL;
- KeyValueMap* _tmp3_ = NULL;
+#line 23253 "Photo.c"
+ KeyValueMap* _tmp2_;
+ KeyValueMap* _tmp3_;
#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = key_value_map_new ("redeye");
#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23260,7 +23264,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
_tmp3_ = map;
#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
key_value_map_set_int (_tmp3_, "num_points", 0);
-#line 23262 "Photo.c"
+#line 23266 "Photo.c"
}
#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = map;
@@ -23320,9 +23324,9 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
_tmp23_ = photo_set_transformation (self, _tmp22_);
#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp23_) {
-#line 23322 "Photo.c"
- Alteration* _tmp24_ = NULL;
- Alteration* _tmp25_ = NULL;
+#line 23326 "Photo.c"
+ Alteration* _tmp24_;
+ Alteration* _tmp25_;
#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = alteration_new ("image", "redeye");
#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23331,7 +23335,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp25_);
-#line 23333 "Photo.c"
+#line 23337 "Photo.c"
}
#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (center_key);
@@ -23339,7 +23343,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
_g_free0 (radius_key);
#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
_key_value_map_unref0 (map);
-#line 23341 "Photo.c"
+#line 23345 "Photo.c"
}
@@ -23352,21 +23356,21 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (scaling != NULL, FALSE);
-#line 23354 "Photo.c"
+#line 23358 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
gboolean _tmp8_ = FALSE;
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23362 "Photo.c"
+#line 23366 "Photo.c"
{
- Scaling _tmp1_ = {0};
- PhotoException _tmp2_ = 0;
+ Scaling _tmp1_;
+ PhotoException _tmp2_;
Dimensions _tmp3_ = {0};
Dimensions _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = *scaling;
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23379,39 +23383,39 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
_vala_scaled_to_viewport = _tmp4_;
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp5_;
-#line 23381 "Photo.c"
+#line 23385 "Photo.c"
{
- PhotoRow* _tmp6_ = NULL;
+ PhotoRow* _tmp6_;
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->row;
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23388 "Photo.c"
+#line 23392 "Photo.c"
}
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_image) {
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_image = _vala_scaled_image;
-#line 23394 "Photo.c"
+#line 23398 "Photo.c"
}
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_to_viewport) {
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23400 "Photo.c"
+#line 23404 "Photo.c"
}
#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23404 "Photo.c"
+#line 23408 "Photo.c"
}
- __finally379:
+ __finally380:
{
- PhotoRow* _tmp7_ = NULL;
+ PhotoRow* _tmp7_;
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->row;
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23413 "Photo.c"
+#line 23417 "Photo.c"
}
#line 3049 "/home/jens/Source/shotwell/src/Photo.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);
@@ -23419,19 +23423,19 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
g_clear_error (&_inner_error_);
#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp8_;
-#line 23421 "Photo.c"
+#line 23425 "Photo.c"
}
#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_image) {
#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_image = _vala_scaled_image;
-#line 23427 "Photo.c"
+#line 23431 "Photo.c"
}
#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_to_viewport) {
#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23433 "Photo.c"
+#line 23437 "Photo.c"
}
}
@@ -23442,19 +23446,19 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
gboolean result = FALSE;
Dimensions raw = {0};
Dimensions _tmp0_ = {0};
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
Orientation orientation = 0;
- Orientation _tmp4_ = 0;
- PhotoException _tmp5_ = 0;
- gboolean _tmp6_ = FALSE;
- gboolean _tmp38_ = FALSE;
+ Orientation _tmp4_;
+ PhotoException _tmp5_;
+ gboolean _tmp6_;
+ gboolean _tmp38_;
gboolean _tmp53_ = FALSE;
- Dimensions _tmp54_ = {0};
- gint _tmp55_ = 0;
- Dimensions _tmp56_ = {0};
- gint _tmp57_ = 0;
- gboolean _tmp63_ = FALSE;
- gboolean _tmp64_ = FALSE;
+ Dimensions _tmp54_;
+ gint _tmp55_;
+ Dimensions _tmp56_;
+ gint _tmp57_;
+ gboolean _tmp63_;
+ gboolean _tmp64_;
#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23467,9 +23471,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp1_ = scaling_is_unscaled (scaling);
#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
-#line 23469 "Photo.c"
- Dimensions _tmp2_ = {0};
- Dimensions _tmp3_ = {0};
+#line 23473 "Photo.c"
+ Dimensions _tmp2_;
+ Dimensions _tmp3_;
#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = raw;
#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23484,17 +23488,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
if (scaled_image) {
#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_image = _vala_scaled_image;
-#line 23486 "Photo.c"
+#line 23490 "Photo.c"
}
#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_to_viewport) {
#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23492 "Photo.c"
+#line 23496 "Photo.c"
}
#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23496 "Photo.c"
+#line 23500 "Photo.c"
}
#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_get_orientation (self);
@@ -23510,34 +23514,34 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP);
#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_) {
-#line 23512 "Photo.c"
+#line 23516 "Photo.c"
Box crop = {0};
Box _tmp7_ = {0};
- gboolean _tmp8_ = FALSE;
+ gboolean _tmp8_;
#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_get_raw_crop (self, &_tmp7_);
#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
crop = _tmp7_;
#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
-#line 23522 "Photo.c"
+#line 23526 "Photo.c"
Dimensions rotated_raw = {0};
- Dimensions _tmp9_ = {0};
- PhotoException _tmp10_ = 0;
- gboolean _tmp11_ = FALSE;
+ Dimensions _tmp9_;
+ PhotoException _tmp10_;
+ gboolean _tmp11_;
Box scaled_crop = {0};
Dimensions _tmp19_ = {0};
Dimensions _tmp20_ = {0};
Box _tmp21_ = {0};
Dimensions _tmp22_ = {0};
gboolean _tmp23_ = FALSE;
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+ gint _tmp24_;
+ gint _tmp25_;
Dimensions _tmp30_ = {0};
Dimensions _tmp31_ = {0};
Dimensions _tmp32_ = {0};
- PhotoException _tmp33_ = 0;
- gboolean _tmp34_ = FALSE;
+ PhotoException _tmp33_;
+ gboolean _tmp34_;
#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = raw;
#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23548,13 +23552,13 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION);
#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 23550 "Photo.c"
- Orientation _tmp12_ = 0;
- Dimensions _tmp13_ = {0};
- Box _tmp14_ = {0};
+#line 23554 "Photo.c"
+ Orientation _tmp12_;
+ Dimensions _tmp13_;
+ Box _tmp14_;
Box _tmp15_ = {0};
- Orientation _tmp16_ = 0;
- Dimensions _tmp17_ = {0};
+ Orientation _tmp16_;
+ Dimensions _tmp17_;
Dimensions _tmp18_ = {0};
#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = orientation;
@@ -23574,7 +23578,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_);
#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
rotated_raw = _tmp18_;
-#line 23576 "Photo.c"
+#line 23580 "Photo.c"
}
#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
box_get_dimensions (&crop, &_tmp19_);
@@ -23594,25 +23598,25 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp25_ = box_get_width (&scaled_crop);
#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp24_ <= _tmp25_) {
-#line 23596 "Photo.c"
- gint _tmp26_ = 0;
- gint _tmp27_ = 0;
+#line 23600 "Photo.c"
+ gint _tmp26_;
+ gint _tmp27_;
#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = box_get_height (&crop);
#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = box_get_height (&scaled_crop);
#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23605 "Photo.c"
+#line 23609 "Photo.c"
} else {
#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = FALSE;
-#line 23609 "Photo.c"
+#line 23613 "Photo.c"
}
#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp23_) {
-#line 23613 "Photo.c"
- Dimensions _tmp28_ = {0};
+#line 23617 "Photo.c"
+ Dimensions _tmp28_;
Dimensions _tmp29_ = {0};
#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = raw;
@@ -23628,17 +23632,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
if (scaled_image) {
#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_image = _vala_scaled_image;
-#line 23630 "Photo.c"
+#line 23634 "Photo.c"
}
#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_to_viewport) {
#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23636 "Photo.c"
+#line 23640 "Photo.c"
}
#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23640 "Photo.c"
+#line 23644 "Photo.c"
}
#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
box_get_dimensions (&crop, &_tmp30_);
@@ -23654,9 +23658,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION);
#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp34_) {
-#line 23656 "Photo.c"
- Orientation _tmp35_ = 0;
- Dimensions _tmp36_ = {0};
+#line 23660 "Photo.c"
+ Orientation _tmp35_;
+ Dimensions _tmp36_;
Dimensions _tmp37_ = {0};
#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = orientation;
@@ -23666,7 +23670,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_);
#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_scaled_image = _tmp37_;
-#line 23668 "Photo.c"
+#line 23672 "Photo.c"
}
}
}
@@ -23674,16 +23678,16 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp38_ = dimensions_has_area (&_vala_scaled_image);
#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp38_) {
-#line 23676 "Photo.c"
+#line 23680 "Photo.c"
Dimensions rotated_raw = {0};
- Dimensions _tmp39_ = {0};
- PhotoException _tmp40_ = 0;
- gboolean _tmp41_ = FALSE;
- Dimensions _tmp45_ = {0};
+ Dimensions _tmp39_;
+ PhotoException _tmp40_;
+ gboolean _tmp41_;
+ Dimensions _tmp45_;
Dimensions _tmp46_ = {0};
- Dimensions _tmp47_ = {0};
- PhotoException _tmp48_ = 0;
- gboolean _tmp49_ = FALSE;
+ Dimensions _tmp47_;
+ PhotoException _tmp48_;
+ gboolean _tmp49_;
#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = raw;
#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23694,9 +23698,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION);
#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp41_) {
-#line 23696 "Photo.c"
- Orientation _tmp42_ = 0;
- Dimensions _tmp43_ = {0};
+#line 23700 "Photo.c"
+ Orientation _tmp42_;
+ Dimensions _tmp43_;
Dimensions _tmp44_ = {0};
#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = orientation;
@@ -23706,7 +23710,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_);
#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
rotated_raw = _tmp44_;
-#line 23708 "Photo.c"
+#line 23712 "Photo.c"
}
#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = rotated_raw;
@@ -23724,9 +23728,9 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION);
#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp49_) {
-#line 23726 "Photo.c"
- Orientation _tmp50_ = 0;
- Dimensions _tmp51_ = {0};
+#line 23730 "Photo.c"
+ Orientation _tmp50_;
+ Dimensions _tmp51_;
Dimensions _tmp52_ = {0};
#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = orientation;
@@ -23736,7 +23740,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_);
#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_scaled_image = _tmp52_;
-#line 23738 "Photo.c"
+#line 23742 "Photo.c"
}
}
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23749,11 +23753,11 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp57_ = _tmp56_.width;
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp55_ >= _tmp57_) {
-#line 23751 "Photo.c"
- Dimensions _tmp58_ = {0};
- gint _tmp59_ = 0;
- Dimensions _tmp60_ = {0};
- gint _tmp61_ = 0;
+#line 23755 "Photo.c"
+ Dimensions _tmp58_;
+ gint _tmp59_;
+ Dimensions _tmp60_;
+ gint _tmp61_;
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = _vala_scaled_image;
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23764,16 +23768,16 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
_tmp61_ = _tmp60_.height;
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp53_ = _tmp59_ >= _tmp61_;
-#line 23766 "Photo.c"
+#line 23770 "Photo.c"
} else {
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp53_ = FALSE;
-#line 23770 "Photo.c"
+#line 23774 "Photo.c"
}
#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp53_) {
-#line 23774 "Photo.c"
- Dimensions _tmp62_ = {0};
+#line 23778 "Photo.c"
+ Dimensions _tmp62_;
#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp62_ = raw;
#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23784,17 +23788,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
if (scaled_image) {
#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_image = _vala_scaled_image;
-#line 23786 "Photo.c"
+#line 23790 "Photo.c"
}
#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_to_viewport) {
#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23792 "Photo.c"
+#line 23796 "Photo.c"
}
#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23796 "Photo.c"
+#line 23800 "Photo.c"
}
#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp63_ = dimensions_has_area (&_vala_scaled_image);
@@ -23810,43 +23814,43 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
if (scaled_image) {
#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_image = _vala_scaled_image;
-#line 23812 "Photo.c"
+#line 23816 "Photo.c"
}
#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
if (scaled_to_viewport) {
#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23818 "Photo.c"
+#line 23822 "Photo.c"
}
#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23822 "Photo.c"
+#line 23826 "Photo.c"
}
static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error) {
GdkPixbuf* result = NULL;
PhotoFileReader* loader = NULL;
- BackingFetchMode _tmp0_ = 0;
- PhotoFileReader* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ BackingFetchMode _tmp0_;
+ PhotoFileReader* _tmp1_;
+ gboolean _tmp2_;
Dimensions scaled_image = {0};
Dimensions scaled_to_viewport = {0};
gboolean is_scaled = FALSE;
- Scaling _tmp7_ = {0};
- PhotoException _tmp8_ = 0;
+ Scaling _tmp7_;
+ PhotoException _tmp8_;
Dimensions _tmp9_ = {0};
Dimensions _tmp10_ = {0};
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
GdkPixbuf* pixbuf = NULL;
- PhotoFileReader* _tmp17_ = NULL;
+ PhotoFileReader* _tmp17_;
Dimensions _tmp18_ = {0};
- Dimensions _tmp19_ = {0};
- GdkPixbuf* _tmp20_ = NULL;
- GdkPixbuf* _tmp21_ = NULL;
+ Dimensions _tmp19_;
+ GdkPixbuf* _tmp20_;
+ GdkPixbuf* _tmp21_;
Dimensions _tmp22_ = {0};
- gboolean _tmp23_ = FALSE;
+ gboolean _tmp23_;
GError * _inner_error_ = NULL;
#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -23862,11 +23866,11 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_tmp2_ = scaling_is_unscaled (scaling);
#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 23864 "Photo.c"
+#line 23868 "Photo.c"
GdkPixbuf* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
+ PhotoFileReader* _tmp4_;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = loader;
#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23881,7 +23885,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_photo_file_adapter_unref0 (loader);
#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 23883 "Photo.c"
+#line 23887 "Photo.c"
}
#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp3_;
@@ -23895,7 +23899,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_photo_file_adapter_unref0 (loader);
#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23897 "Photo.c"
+#line 23901 "Photo.c"
}
#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = *scaling;
@@ -23913,11 +23917,11 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_tmp12_ = is_scaled;
#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp12_) {
-#line 23915 "Photo.c"
+#line 23919 "Photo.c"
GdkPixbuf* _tmp13_ = NULL;
- PhotoFileReader* _tmp14_ = NULL;
- GdkPixbuf* _tmp15_ = NULL;
- GdkPixbuf* _tmp16_ = NULL;
+ PhotoFileReader* _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp16_;
#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = loader;
#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23932,7 +23936,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_photo_file_adapter_unref0 (loader);
#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 23934 "Photo.c"
+#line 23938 "Photo.c"
}
#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = _tmp13_;
@@ -23946,7 +23950,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_photo_file_adapter_unref0 (loader);
#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23948 "Photo.c"
+#line 23952 "Photo.c"
}
#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = loader;
@@ -23966,7 +23970,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_photo_file_adapter_unref0 (loader);
#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 23968 "Photo.c"
+#line 23972 "Photo.c"
}
#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = pixbuf;
@@ -23982,17 +23986,17 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
_photo_file_adapter_unref0 (loader);
#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 23984 "Photo.c"
+#line 23988 "Photo.c"
}
GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) {
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- Scaling _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ Scaling _tmp1_;
+ gboolean _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
GError * _inner_error_ = NULL;
#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24012,7 +24016,7 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
g_propagate_error (error, _inner_error_);
#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24014 "Photo.c"
+#line 24018 "Photo.c"
}
#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp0_;
@@ -24024,17 +24028,17 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
_g_object_unref0 (_tmp0_);
#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24026 "Photo.c"
+#line 24030 "Photo.c"
}
GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error) {
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- Scaling _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ Scaling _tmp1_;
+ gboolean _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
GError * _inner_error_ = NULL;
#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24054,7 +24058,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
g_propagate_error (error, _inner_error_);
#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24056 "Photo.c"
+#line 24060 "Photo.c"
}
#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp0_;
@@ -24066,7 +24070,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
_g_object_unref0 (_tmp0_);
#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24068 "Photo.c"
+#line 24072 "Photo.c"
}
@@ -24076,28 +24080,28 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
Dimensions scaled_to_viewport = {0};
Orientation original_orientation = 0;
GdkPixbuf* pixbuf = NULL;
- Scaling _tmp6_ = {0};
- BackingFetchMode _tmp7_ = 0;
- GdkPixbuf* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ Scaling _tmp6_;
+ BackingFetchMode _tmp7_;
+ GdkPixbuf* _tmp8_;
+ gboolean _tmp9_;
GError * _inner_error_ = NULL;
#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (scaling != NULL, NULL);
-#line 24087 "Photo.c"
+#line 24091 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24094 "Photo.c"
+#line 24098 "Photo.c"
{
- Scaling _tmp1_ = {0};
+ Scaling _tmp1_;
Dimensions _tmp2_ = {0};
Dimensions _tmp3_ = {0};
- Orientation _tmp4_ = 0;
+ Orientation _tmp4_;
#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = *scaling;
#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24110,16 +24114,16 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
_tmp4_ = photo_get_original_orientation (self);
#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
original_orientation = _tmp4_;
-#line 24112 "Photo.c"
+#line 24116 "Photo.c"
}
- __finally380:
+ __finally381:
{
- PhotoRow* _tmp5_ = NULL;
+ PhotoRow* _tmp5_;
#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = self->row;
#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24121 "Photo.c"
+#line 24125 "Photo.c"
}
#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -24127,7 +24131,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
g_propagate_error (error, _inner_error_);
#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24129 "Photo.c"
+#line 24133 "Photo.c"
}
}
#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24144,15 +24148,15 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
g_propagate_error (error, _inner_error_);
#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24146 "Photo.c"
+#line 24150 "Photo.c"
}
#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = rotate;
#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp9_) {
-#line 24152 "Photo.c"
- GdkPixbuf* _tmp10_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
+#line 24156 "Photo.c"
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = pixbuf;
#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24161,13 +24165,13 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
_g_object_unref0 (pixbuf);
#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = _tmp11_;
-#line 24163 "Photo.c"
+#line 24167 "Photo.c"
}
#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
result = pixbuf;
#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24169 "Photo.c"
+#line 24173 "Photo.c"
}
@@ -24175,9 +24179,9 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
Photo * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- Scaling _tmp1_ = {0};
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
+ Scaling _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
GError * _inner_error_ = NULL;
#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -24195,7 +24199,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
g_propagate_error (error, _inner_error_);
#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24197 "Photo.c"
+#line 24201 "Photo.c"
}
#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp0_;
@@ -24207,7 +24211,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
_g_object_unref0 (_tmp0_);
#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24209 "Photo.c"
+#line 24213 "Photo.c"
}
@@ -24229,7 +24233,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
static gpointer _photo_cached_pixbuf_ref0 (gpointer self) {
#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? photo_cached_pixbuf_ref (self) : NULL;
-#line 24231 "Photo.c"
+#line 24235 "Photo.c"
}
@@ -24238,7 +24242,7 @@ static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) {
result = photo_trim_source_pixbuf_cache ();
#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24240 "Photo.c"
+#line 24244 "Photo.c"
}
@@ -24247,33 +24251,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
GError * _inner_error_ = NULL;
#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL);
-#line 24249 "Photo.c"
+#line 24253 "Photo.c"
{
- GeeLinkedList* _tmp0_ = NULL;
+ GeeLinkedList* _tmp0_;
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo_source_pixbuf_cache;
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache);
-#line 24256 "Photo.c"
+#line 24260 "Photo.c"
{
PhotoCachedPixbuf* found = NULL;
gdouble min_elapsed = 0.0;
gint count = 0;
GeeIterator* iter = NULL;
- GeeLinkedList* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeLinkedList* _tmp1_;
+ GeeIterator* _tmp2_;
gboolean _tmp29_ = FALSE;
gboolean _tmp30_ = FALSE;
- PhotoCachedPixbuf* _tmp31_ = NULL;
+ PhotoCachedPixbuf* _tmp31_;
gboolean _tmp43_ = FALSE;
- PhotoCachedPixbuf* _tmp44_ = NULL;
- guint _tmp59_ = 0U;
- GeeLinkedList* _tmp61_ = NULL;
- gint _tmp62_ = 0;
- gint _tmp63_ = 0;
+ PhotoCachedPixbuf* _tmp44_;
+ guint _tmp59_;
+ GeeLinkedList* _tmp61_;
+ gint _tmp62_;
+ gint _tmp63_;
GdkPixbuf* _tmp69_ = NULL;
- PhotoCachedPixbuf* _tmp70_ = NULL;
- GdkPixbuf* _tmp73_ = NULL;
+ PhotoCachedPixbuf* _tmp70_;
+ GdkPixbuf* _tmp73_;
#line 3256 "/home/jens/Source/shotwell/src/Photo.vala"
found = NULL;
#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24288,19 +24292,19 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
iter = _tmp2_;
#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 24290 "Photo.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 24294 "Photo.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
PhotoCachedPixbuf* cached_pixbuf = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
gdouble elapsed = 0.0;
- PhotoCachedPixbuf* _tmp7_ = NULL;
- GTimer* _tmp8_ = NULL;
- gdouble _tmp9_ = 0.0;
- gdouble _tmp10_ = 0.0;
+ PhotoCachedPixbuf* _tmp7_;
+ GTimer* _tmp8_;
+ gdouble _tmp9_;
+ gdouble _tmp10_;
gboolean _tmp11_ = FALSE;
- Photo* _tmp12_ = NULL;
+ Photo* _tmp12_;
#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = iter;
#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24309,7 +24313,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
if (!_tmp4_) {
#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 24311 "Photo.c"
+#line 24315 "Photo.c"
}
#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = iter;
@@ -24331,11 +24335,11 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp12_ = locate;
#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_ != NULL) {
-#line 24333 "Photo.c"
- PhotoCachedPixbuf* _tmp13_ = NULL;
- Photo* _tmp14_ = NULL;
- Photo* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 24337 "Photo.c"
+ PhotoCachedPixbuf* _tmp13_;
+ Photo* _tmp14_;
+ Photo* _tmp15_;
+ gboolean _tmp16_;
#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = cached_pixbuf;
#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24346,19 +24350,19 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource));
#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _tmp16_;
-#line 24348 "Photo.c"
+#line 24352 "Photo.c"
} else {
#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = FALSE;
-#line 24352 "Photo.c"
+#line 24356 "Photo.c"
}
#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 24356 "Photo.c"
- GeeIterator* _tmp17_ = NULL;
- PhotoCachedPixbuf* _tmp18_ = NULL;
- PhotoCachedPixbuf* _tmp19_ = NULL;
- gint _tmp20_ = 0;
+#line 24360 "Photo.c"
+ GeeIterator* _tmp17_;
+ PhotoCachedPixbuf* _tmp18_;
+ PhotoCachedPixbuf* _tmp19_;
+ gint _tmp20_;
#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = iter;
#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24375,38 +24379,38 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp20_ = count;
#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
count = _tmp20_ + 1;
-#line 24377 "Photo.c"
+#line 24381 "Photo.c"
} else {
- gdouble _tmp21_ = 0.0;
+ gdouble _tmp21_;
#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = elapsed;
#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) {
-#line 24384 "Photo.c"
- GeeIterator* _tmp22_ = NULL;
+#line 24388 "Photo.c"
+ GeeIterator* _tmp22_;
#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = iter;
#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
gee_iterator_remove (_tmp22_);
-#line 24390 "Photo.c"
+#line 24394 "Photo.c"
} else {
- gint _tmp23_ = 0;
+ gint _tmp23_;
#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = count;
#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) {
-#line 24397 "Photo.c"
- GeeIterator* _tmp24_ = NULL;
+#line 24401 "Photo.c"
+ GeeIterator* _tmp24_;
#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = iter;
#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
gee_iterator_remove (_tmp24_);
-#line 24403 "Photo.c"
+#line 24407 "Photo.c"
} else {
- gdouble _tmp25_ = 0.0;
- gdouble _tmp26_ = 0.0;
- gdouble _tmp27_ = 0.0;
- gint _tmp28_ = 0;
+ gdouble _tmp25_;
+ gdouble _tmp26_;
+ gdouble _tmp27_;
+ gint _tmp28_;
#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = elapsed;
#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24419,53 +24423,53 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp28_ = count;
#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
count = _tmp28_ + 1;
-#line 24421 "Photo.c"
+#line 24425 "Photo.c"
}
}
}
#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24427 "Photo.c"
+#line 24431 "Photo.c"
}
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = found;
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp31_ == NULL) {
-#line 24433 "Photo.c"
- Photo* _tmp32_ = NULL;
+#line 24437 "Photo.c"
+ Photo* _tmp32_;
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = locate;
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = _tmp32_ != NULL;
-#line 24439 "Photo.c"
+#line 24443 "Photo.c"
} else {
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = FALSE;
-#line 24443 "Photo.c"
+#line 24447 "Photo.c"
}
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp30_) {
-#line 24447 "Photo.c"
- gboolean _tmp33_ = FALSE;
+#line 24451 "Photo.c"
+ gboolean _tmp33_;
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp33_ = keep;
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = _tmp33_;
-#line 24453 "Photo.c"
+#line 24457 "Photo.c"
} else {
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = FALSE;
-#line 24457 "Photo.c"
+#line 24461 "Photo.c"
}
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp29_) {
-#line 24461 "Photo.c"
+#line 24465 "Photo.c"
GdkPixbuf* _tmp34_ = NULL;
- Photo* _tmp35_ = NULL;
+ Photo* _tmp35_;
Scaling _tmp36_ = {0};
- GdkPixbuf* _tmp37_ = NULL;
- Photo* _tmp38_ = NULL;
- PhotoCachedPixbuf* _tmp39_ = NULL;
+ GdkPixbuf* _tmp37_;
+ Photo* _tmp38_;
+ PhotoCachedPixbuf* _tmp39_;
#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = locate;
#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24480,8 +24484,8 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_g_object_unref0 (iter);
#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_cached_pixbuf_unref0 (found);
-#line 24482 "Photo.c"
- goto __finally381;
+#line 24486 "Photo.c"
+ goto __finally382;
}
#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = locate;
@@ -24493,51 +24497,51 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
found = _tmp39_;
#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp34_);
-#line 24495 "Photo.c"
+#line 24499 "Photo.c"
} else {
- PhotoCachedPixbuf* _tmp40_ = NULL;
+ PhotoCachedPixbuf* _tmp40_;
#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = found;
#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp40_ != NULL) {
-#line 24502 "Photo.c"
- PhotoCachedPixbuf* _tmp41_ = NULL;
- GTimer* _tmp42_ = NULL;
+#line 24506 "Photo.c"
+ PhotoCachedPixbuf* _tmp41_;
+ GTimer* _tmp42_;
#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = found;
#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = _tmp41_->last_touched;
#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
g_timer_start (_tmp42_);
-#line 24511 "Photo.c"
+#line 24515 "Photo.c"
}
}
#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp44_ = found;
#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp44_ != NULL) {
-#line 24518 "Photo.c"
- gboolean _tmp45_ = FALSE;
+#line 24522 "Photo.c"
+ gboolean _tmp45_;
#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = keep;
#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = _tmp45_;
-#line 24524 "Photo.c"
+#line 24528 "Photo.c"
} else {
#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = FALSE;
-#line 24528 "Photo.c"
+#line 24532 "Photo.c"
}
#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp43_) {
-#line 24532 "Photo.c"
- GeeLinkedList* _tmp46_ = NULL;
- PhotoCachedPixbuf* _tmp47_ = NULL;
- PhotoCachedPixbuf* _tmp48_ = NULL;
- GTimer* _tmp49_ = NULL;
- gdouble _tmp50_ = 0.0;
- gdouble _tmp51_ = 0.0;
- gdouble _tmp52_ = 0.0;
+#line 24536 "Photo.c"
+ GeeLinkedList* _tmp46_;
+ PhotoCachedPixbuf* _tmp47_;
+ PhotoCachedPixbuf* _tmp48_;
+ GTimer* _tmp49_;
+ gdouble _tmp50_;
+ gdouble _tmp51_;
+ gdouble _tmp52_;
#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = photo_source_pixbuf_cache;
#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24558,13 +24562,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
min_elapsed = _tmp52_;
#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 24560 "Photo.c"
- GeeLinkedList* _tmp53_ = NULL;
- gint _tmp54_ = 0;
- gint _tmp55_ = 0;
- GeeLinkedList* _tmp56_ = NULL;
- gpointer _tmp57_ = NULL;
- PhotoCachedPixbuf* _tmp58_ = NULL;
+#line 24564 "Photo.c"
+ GeeLinkedList* _tmp53_;
+ gint _tmp54_;
+ gint _tmp55_;
+ GeeLinkedList* _tmp56_;
+ gpointer _tmp57_;
+ PhotoCachedPixbuf* _tmp58_;
#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp53_ = photo_source_pixbuf_cache;
#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24575,7 +24579,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 24577 "Photo.c"
+#line 24581 "Photo.c"
}
#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp56_ = photo_source_pixbuf_cache;
@@ -24585,22 +24589,22 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp58_ = (PhotoCachedPixbuf*) _tmp57_;
#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_cached_pixbuf_unref0 (_tmp58_);
-#line 24587 "Photo.c"
+#line 24591 "Photo.c"
}
}
#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = photo_discard_source_id;
#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp59_ != ((guint) 0)) {
-#line 24594 "Photo.c"
- guint _tmp60_ = 0U;
+#line 24598 "Photo.c"
+ guint _tmp60_;
#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp60_ = photo_discard_source_id;
#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
g_source_remove (_tmp60_);
#line 3314 "/home/jens/Source/shotwell/src/Photo.vala"
photo_discard_source_id = (guint) 0;
-#line 24602 "Photo.c"
+#line 24606 "Photo.c"
}
#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = photo_source_pixbuf_cache;
@@ -24610,13 +24614,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp63_ = _tmp62_;
#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24612 "Photo.c"
- gdouble _tmp64_ = 0.0;
+#line 24616 "Photo.c"
+ gdouble _tmp64_;
guint retry_sec = 0U;
- gdouble _tmp65_ = 0.0;
- gdouble _tmp66_ = 0.0;
- guint _tmp67_ = 0U;
- guint _tmp68_ = 0U;
+ gdouble _tmp65_;
+ gdouble _tmp66_;
+ guint _tmp67_;
+ guint _tmp68_;
#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp64_ = min_elapsed;
#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24633,26 +24637,26 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL);
#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
photo_discard_source_id = _tmp68_;
-#line 24635 "Photo.c"
+#line 24639 "Photo.c"
}
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp70_ = found;
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp70_ != NULL) {
-#line 24641 "Photo.c"
- PhotoCachedPixbuf* _tmp71_ = NULL;
- GdkPixbuf* _tmp72_ = NULL;
+#line 24645 "Photo.c"
+ PhotoCachedPixbuf* _tmp71_;
+ GdkPixbuf* _tmp72_;
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp71_ = found;
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp72_ = _tmp71_->pixbuf;
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = _tmp72_;
-#line 24650 "Photo.c"
+#line 24654 "Photo.c"
} else {
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = NULL;
-#line 24654 "Photo.c"
+#line 24658 "Photo.c"
}
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp73_ = _g_object_ref0 (_tmp69_);
@@ -24662,33 +24666,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
_g_object_unref0 (iter);
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_cached_pixbuf_unref0 (found);
-#line 24664 "Photo.c"
+#line 24668 "Photo.c"
{
- GeeLinkedList* _tmp74_ = NULL;
+ GeeLinkedList* _tmp74_;
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp74_ = photo_source_pixbuf_cache;
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24671 "Photo.c"
+#line 24675 "Photo.c"
}
#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24675 "Photo.c"
+#line 24679 "Photo.c"
}
- __finally381:
+ __finally382:
{
- GeeLinkedList* _tmp75_ = NULL;
+ GeeLinkedList* _tmp75_;
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp75_ = photo_source_pixbuf_cache;
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24684 "Photo.c"
+#line 24688 "Photo.c"
}
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24690 "Photo.c"
+#line 24694 "Photo.c"
}
}
@@ -24697,8 +24701,8 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
gboolean result = FALSE;
GError * _inner_error_ = NULL;
{
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_);
#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24707,12 +24711,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
_g_object_unref0 (_tmp1_);
#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24709 "Photo.c"
- goto __catch382_g_error;
+#line 24713 "Photo.c"
+ goto __catch383_g_error;
}
}
- goto __finally382;
- __catch382_g_error:
+ goto __finally383;
+ __catch383_g_error:
{
GError* err = NULL;
#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24721,12 +24725,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
_inner_error_ = NULL;
#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 24723 "Photo.c"
+#line 24727 "Photo.c"
}
- __finally382:
+ __finally383:
#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24728 "Photo.c"
+#line 24732 "Photo.c"
gboolean _tmp2_ = FALSE;
#line 3331 "/home/jens/Source/shotwell/src/Photo.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);
@@ -24734,13 +24738,13 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
g_clear_error (&_inner_error_);
#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp2_;
-#line 24736 "Photo.c"
+#line 24740 "Photo.c"
}
#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24742 "Photo.c"
+#line 24746 "Photo.c"
}
@@ -24752,11 +24756,8 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp2_;
GError * _inner_error_ = NULL;
#line 3344 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24770,27 +24771,17 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 24772 "Photo.c"
+#line 24773 "Photo.c"
}
#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp2_ = _tmp0_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp0_ = NULL;
+ _tmp2_ = gdk_pixbuf_copy (_tmp0_);
#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp3_ = _tmp2_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp4_ = gdk_pixbuf_copy (_tmp3_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp5_ = _tmp4_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- _g_object_unref0 (_tmp3_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
- result = _tmp5_;
+ result = _tmp2_;
#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp0_);
#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 24792 "Photo.c"
+#line 24783 "Photo.c"
}
@@ -24801,10 +24792,10 @@ void photo_discard_prefetched (Photo* self) {
GError * _inner_error_ = NULL;
#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
-#line 24803 "Photo.c"
+#line 24794 "Photo.c"
{
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_);
#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24813,12 +24804,12 @@ void photo_discard_prefetched (Photo* self) {
_g_object_unref0 (_tmp1_);
#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24815 "Photo.c"
- goto __catch383_g_error;
+#line 24806 "Photo.c"
+ goto __catch384_g_error;
}
}
- goto __finally383;
- __catch383_g_error:
+ goto __finally384;
+ __catch384_g_error:
{
GError* err = NULL;
#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24827,9 +24818,9 @@ void photo_discard_prefetched (Photo* self) {
_inner_error_ = NULL;
#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 24829 "Photo.c"
+#line 24820 "Photo.c"
}
- __finally383:
+ __finally384:
#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24838,7 +24829,7 @@ void photo_discard_prefetched (Photo* self) {
g_clear_error (&_inner_error_);
#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 24840 "Photo.c"
+#line 24831 "Photo.c"
}
}
@@ -24859,8 +24850,8 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
gboolean is_scaled = FALSE;
gboolean is_cropped = FALSE;
gboolean is_straightened = FALSE;
@@ -24868,27 +24859,27 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
Dimensions original = {0};
Dimensions scaled = {0};
EditingToolsRedeyeInstance* redeye_instances = NULL;
- gint redeye_instances_length1 = 0;
- gint _redeye_instances_size_ = 0;
+ gint redeye_instances_length1;
+ gint _redeye_instances_size_;
Box crop = {0};
gdouble straightening_angle = 0.0;
PixelTransformer* transformer = NULL;
Orientation orientation = 0;
GdkPixbuf* pixbuf = NULL;
- GdkPixbuf* _tmp33_ = NULL;
- PhotoException _tmp34_ = 0;
- gboolean _tmp35_ = FALSE;
- PhotoException _tmp40_ = 0;
- gboolean _tmp41_ = FALSE;
- PhotoException _tmp46_ = 0;
- gboolean _tmp47_ = FALSE;
- PhotoException _tmp85_ = 0;
- gboolean _tmp86_ = FALSE;
- gboolean _tmp89_ = FALSE;
- PhotoException _tmp96_ = 0;
- gboolean _tmp97_ = FALSE;
+ GdkPixbuf* _tmp33_;
+ PhotoException _tmp34_;
+ gboolean _tmp35_;
+ PhotoException _tmp40_;
+ gboolean _tmp41_;
+ PhotoException _tmp46_;
+ gboolean _tmp47_;
+ PhotoException _tmp85_;
+ gboolean _tmp86_;
+ gboolean _tmp89_;
+ PhotoException _tmp96_;
+ gboolean _tmp97_;
gboolean _tmp101_ = FALSE;
- gboolean _tmp102_ = FALSE;
+ gboolean _tmp102_;
GError * _inner_error_ = NULL;
#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
@@ -24900,86 +24891,86 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp4_ = _tmp3_;
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp4_) {
-#line 24902 "Photo.c"
- PhotoFileFormat _tmp5_ = 0;
+#line 24893 "Photo.c"
+ PhotoFileFormat _tmp5_;
#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = photo_get_master_file_format (self);
#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW;
-#line 24908 "Photo.c"
+#line 24899 "Photo.c"
} else {
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = FALSE;
-#line 24912 "Photo.c"
+#line 24903 "Photo.c"
}
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 24916 "Photo.c"
+#line 24907 "Photo.c"
gboolean _tmp6_ = FALSE;
gboolean _tmp7_ = FALSE;
- BackingFetchMode _tmp8_ = 0;
+ BackingFetchMode _tmp8_;
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = fetch_mode;
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = TRUE;
-#line 24926 "Photo.c"
+#line 24917 "Photo.c"
} else {
- BackingFetchMode _tmp9_ = 0;
+ BackingFetchMode _tmp9_;
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = fetch_mode;
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED;
-#line 24933 "Photo.c"
+#line 24924 "Photo.c"
}
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_) {
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = TRUE;
-#line 24939 "Photo.c"
+#line 24930 "Photo.c"
} else {
- BackingFetchMode _tmp10_ = 0;
+ BackingFetchMode _tmp10_;
#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = fetch_mode;
#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE;
-#line 24946 "Photo.c"
+#line 24937 "Photo.c"
}
#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp6_;
-#line 24950 "Photo.c"
+#line 24941 "Photo.c"
} else {
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 24954 "Photo.c"
+#line 24945 "Photo.c"
}
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
-#line 24958 "Photo.c"
- RawDeveloper _tmp11_ = 0;
- gboolean _tmp12_ = FALSE;
+#line 24949 "Photo.c"
+ RawDeveloper _tmp11_;
+ gboolean _tmp12_;
#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = photo_get_raw_developer (self);
#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = !_tmp12_;
-#line 24967 "Photo.c"
+#line 24958 "Photo.c"
} else {
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = FALSE;
-#line 24971 "Photo.c"
+#line 24962 "Photo.c"
}
#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_) {
-#line 24975 "Photo.c"
- RawDeveloper _tmp13_ = 0;
+#line 24966 "Photo.c"
+ RawDeveloper _tmp13_;
#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = photo_get_raw_developer (self);
#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_raw_developer (self, _tmp13_);
-#line 24981 "Photo.c"
+#line 24972 "Photo.c"
}
#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
dimensions_init (&original, 0, 0);
@@ -24993,31 +24984,31 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_redeye_instances_size_ = redeye_instances_length1;
#line 3397 "/home/jens/Source/shotwell/src/Photo.vala"
transformer = NULL;
-#line 24995 "Photo.c"
+#line 24986 "Photo.c"
{
- PhotoRow* _tmp14_ = NULL;
+ PhotoRow* _tmp14_;
#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->row;
#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 25002 "Photo.c"
+#line 24993 "Photo.c"
{
Dimensions _tmp15_ = {0};
- PhotoException _tmp16_ = 0;
+ PhotoException _tmp16_;
Dimensions _tmp17_ = {0};
Dimensions _tmp18_ = {0};
- Dimensions _tmp19_ = {0};
+ Dimensions _tmp19_;
Dimensions _tmp20_ = {0};
- Dimensions _tmp21_ = {0};
- gboolean _tmp22_ = FALSE;
- gint _tmp23_ = 0;
- EditingToolsRedeyeInstance* _tmp24_ = NULL;
+ Dimensions _tmp21_;
+ gboolean _tmp22_;
+ gint _tmp23_;
+ EditingToolsRedeyeInstance* _tmp24_;
Box _tmp25_ = {0};
- gboolean _tmp26_ = FALSE;
+ gboolean _tmp26_;
gdouble _tmp27_ = 0.0;
- gboolean _tmp28_ = FALSE;
- gboolean _tmp29_ = FALSE;
- Orientation _tmp31_ = 0;
+ gboolean _tmp28_;
+ gboolean _tmp29_;
+ Orientation _tmp31_;
#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_);
#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25068,30 +25059,30 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp29_ = photo_has_color_adjustments (self);
#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp29_) {
-#line 25070 "Photo.c"
- PixelTransformer* _tmp30_ = NULL;
+#line 25061 "Photo.c"
+ PixelTransformer* _tmp30_;
#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = photo_get_pixel_transformer (self);
#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformer_unref0 (transformer);
#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
transformer = _tmp30_;
-#line 25078 "Photo.c"
+#line 25069 "Photo.c"
}
#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = photo_get_orientation (self);
#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
orientation = _tmp31_;
-#line 25084 "Photo.c"
+#line 25075 "Photo.c"
}
- __finally384:
+ __finally385:
{
- PhotoRow* _tmp32_ = NULL;
+ PhotoRow* _tmp32_;
#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = self->row;
#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 25093 "Photo.c"
+#line 25084 "Photo.c"
}
#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -25103,7 +25094,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
redeye_instances = (g_free (redeye_instances), NULL);
#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 25105 "Photo.c"
+#line 25096 "Photo.c"
}
}
#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25120,7 +25111,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
redeye_instances = (g_free (redeye_instances), NULL);
#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 25122 "Photo.c"
+#line 25113 "Photo.c"
}
#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = exceptions;
@@ -25128,14 +25119,14 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE);
#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp35_) {
-#line 25130 "Photo.c"
- EditingToolsRedeyeInstance* _tmp36_ = NULL;
- gint _tmp36__length1 = 0;
+#line 25121 "Photo.c"
+ EditingToolsRedeyeInstance* _tmp36_;
+ gint _tmp36__length1;
#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = redeye_instances;
#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36__length1 = redeye_instances_length1;
-#line 25137 "Photo.c"
+#line 25128 "Photo.c"
{
EditingToolsRedeyeInstance* instance_collection = NULL;
gint instance_collection_length1 = 0;
@@ -25147,15 +25138,15 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
instance_collection_length1 = _tmp36__length1;
#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) {
-#line 25149 "Photo.c"
+#line 25140 "Photo.c"
EditingToolsRedeyeInstance instance = {0};
#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
instance = instance_collection[instance_it];
-#line 25153 "Photo.c"
+#line 25144 "Photo.c"
{
- GdkPixbuf* _tmp37_ = NULL;
- EditingToolsRedeyeInstance _tmp38_ = {0};
- GdkPixbuf* _tmp39_ = NULL;
+ GdkPixbuf* _tmp37_;
+ EditingToolsRedeyeInstance _tmp38_;
+ GdkPixbuf* _tmp39_;
#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = pixbuf;
#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25166,7 +25157,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_g_object_unref0 (pixbuf);
#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = _tmp39_;
-#line 25168 "Photo.c"
+#line 25159 "Photo.c"
}
}
}
@@ -25177,16 +25168,16 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN);
#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp41_) {
-#line 25179 "Photo.c"
- gboolean _tmp42_ = FALSE;
+#line 25170 "Photo.c"
+ gboolean _tmp42_;
#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = is_straightened;
#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp42_) {
-#line 25185 "Photo.c"
- GdkPixbuf* _tmp43_ = NULL;
- gdouble _tmp44_ = 0.0;
- GdkPixbuf* _tmp45_ = NULL;
+#line 25176 "Photo.c"
+ GdkPixbuf* _tmp43_;
+ gdouble _tmp44_;
+ GdkPixbuf* _tmp45_;
#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = pixbuf;
#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25197,7 +25188,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_g_object_unref0 (pixbuf);
#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = _tmp45_;
-#line 25199 "Photo.c"
+#line 25190 "Photo.c"
}
}
#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25206,49 +25197,49 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP);
#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp47_) {
-#line 25208 "Photo.c"
- gboolean _tmp48_ = FALSE;
+#line 25199 "Photo.c"
+ gboolean _tmp48_;
#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp48_ = is_cropped;
#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp48_) {
-#line 25214 "Photo.c"
- Box _tmp49_ = {0};
- gint _tmp50_ = 0;
- GdkPixbuf* _tmp51_ = NULL;
- gint _tmp52_ = 0;
- gint _tmp53_ = 0;
- gint _tmp54_ = 0;
- Box _tmp55_ = {0};
- gint _tmp56_ = 0;
- GdkPixbuf* _tmp57_ = NULL;
- gint _tmp58_ = 0;
- gint _tmp59_ = 0;
- gint _tmp60_ = 0;
- Box _tmp61_ = {0};
- gint _tmp62_ = 0;
- Box _tmp63_ = {0};
- gint _tmp64_ = 0;
- GdkPixbuf* _tmp65_ = NULL;
- gint _tmp66_ = 0;
- gint _tmp67_ = 0;
- gint _tmp68_ = 0;
- Box _tmp69_ = {0};
- gint _tmp70_ = 0;
- Box _tmp71_ = {0};
- gint _tmp72_ = 0;
- GdkPixbuf* _tmp73_ = NULL;
- gint _tmp74_ = 0;
- gint _tmp75_ = 0;
- gint _tmp76_ = 0;
- GdkPixbuf* _tmp77_ = NULL;
- Box _tmp78_ = {0};
- gint _tmp79_ = 0;
- Box _tmp80_ = {0};
- gint _tmp81_ = 0;
- gint _tmp82_ = 0;
- gint _tmp83_ = 0;
- GdkPixbuf* _tmp84_ = NULL;
+#line 25205 "Photo.c"
+ Box _tmp49_;
+ gint _tmp50_;
+ GdkPixbuf* _tmp51_;
+ gint _tmp52_;
+ gint _tmp53_;
+ gint _tmp54_;
+ Box _tmp55_;
+ gint _tmp56_;
+ GdkPixbuf* _tmp57_;
+ gint _tmp58_;
+ gint _tmp59_;
+ gint _tmp60_;
+ Box _tmp61_;
+ gint _tmp62_;
+ Box _tmp63_;
+ gint _tmp64_;
+ GdkPixbuf* _tmp65_;
+ gint _tmp66_;
+ gint _tmp67_;
+ gint _tmp68_;
+ Box _tmp69_;
+ gint _tmp70_;
+ Box _tmp71_;
+ gint _tmp72_;
+ GdkPixbuf* _tmp73_;
+ gint _tmp74_;
+ gint _tmp75_;
+ gint _tmp76_;
+ GdkPixbuf* _tmp77_;
+ Box _tmp78_;
+ gint _tmp79_;
+ Box _tmp80_;
+ gint _tmp81_;
+ gint _tmp82_;
+ gint _tmp83_;
+ GdkPixbuf* _tmp84_;
#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = crop;
#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25333,7 +25324,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_g_object_unref0 (pixbuf);
#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = _tmp84_;
-#line 25335 "Photo.c"
+#line 25326 "Photo.c"
}
}
#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25342,9 +25333,9 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION);
#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp86_) {
-#line 25344 "Photo.c"
- GdkPixbuf* _tmp87_ = NULL;
- GdkPixbuf* _tmp88_ = NULL;
+#line 25335 "Photo.c"
+ GdkPixbuf* _tmp87_;
+ GdkPixbuf* _tmp88_;
#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp87_ = pixbuf;
#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25353,19 +25344,19 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_g_object_unref0 (pixbuf);
#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = _tmp88_;
-#line 25355 "Photo.c"
+#line 25346 "Photo.c"
}
#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp89_ = is_scaled;
#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp89_) {
-#line 25361 "Photo.c"
- GdkPixbuf* _tmp90_ = NULL;
- Dimensions _tmp91_ = {0};
- gint _tmp92_ = 0;
- Dimensions _tmp93_ = {0};
- gint _tmp94_ = 0;
- GdkPixbuf* _tmp95_ = NULL;
+#line 25352 "Photo.c"
+ GdkPixbuf* _tmp90_;
+ Dimensions _tmp91_;
+ gint _tmp92_;
+ Dimensions _tmp93_;
+ gint _tmp94_;
+ GdkPixbuf* _tmp95_;
#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp90_ = pixbuf;
#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25382,7 +25373,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_g_object_unref0 (pixbuf);
#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = _tmp95_;
-#line 25384 "Photo.c"
+#line 25375 "Photo.c"
}
#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp96_ = exceptions;
@@ -25390,46 +25381,46 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST);
#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp97_) {
-#line 25392 "Photo.c"
- PixelTransformer* _tmp98_ = NULL;
+#line 25383 "Photo.c"
+ PixelTransformer* _tmp98_;
#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp98_ = transformer;
#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp98_ != NULL) {
-#line 25398 "Photo.c"
- PixelTransformer* _tmp99_ = NULL;
- GdkPixbuf* _tmp100_ = NULL;
+#line 25389 "Photo.c"
+ PixelTransformer* _tmp99_;
+ GdkPixbuf* _tmp100_;
#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp99_ = transformer;
#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp100_ = pixbuf;
#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25407 "Photo.c"
+#line 25398 "Photo.c"
}
}
#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp102_ = is_scaled;
#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp102_) {
-#line 25414 "Photo.c"
- gboolean _tmp103_ = FALSE;
+#line 25405 "Photo.c"
+ gboolean _tmp103_;
#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp103_ = is_straightened;
#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp101_ = !_tmp103_;
-#line 25420 "Photo.c"
+#line 25411 "Photo.c"
} else {
#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp101_ = FALSE;
-#line 25424 "Photo.c"
+#line 25415 "Photo.c"
}
#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp101_) {
-#line 25428 "Photo.c"
- GdkPixbuf* _tmp104_ = NULL;
+#line 25419 "Photo.c"
+ GdkPixbuf* _tmp104_;
Dimensions _tmp105_ = {0};
- gboolean _tmp106_ = FALSE;
+ gboolean _tmp106_;
#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp104_ = pixbuf;
#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25438,7 +25429,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
_tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE);
#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 25440 "Photo.c"
+#line 25431 "Photo.c"
}
#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
result = pixbuf;
@@ -25448,7 +25439,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
redeye_instances = (g_free (redeye_instances), NULL);
#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 25450 "Photo.c"
+#line 25441 "Photo.c"
}
@@ -25458,7 +25449,7 @@ static gboolean photo_real_has_user_generated_metadata (Photo* self) {
g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp0_;
-#line 25460 "Photo.c"
+#line 25451 "Photo.c"
}
@@ -25467,7 +25458,7 @@ gboolean photo_has_user_generated_metadata (Photo* self) {
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self);
-#line 25469 "Photo.c"
+#line 25460 "Photo.c"
}
@@ -25476,7 +25467,7 @@ static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata*
g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 25478 "Photo.c"
+#line 25469 "Photo.c"
}
@@ -25485,29 +25476,29 @@ void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
g_return_if_fail (IS_PHOTO (self));
#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata);
-#line 25487 "Photo.c"
+#line 25478 "Photo.c"
}
gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
gchar* result = NULL;
- PhotoFileFormat* _tmp0_ = NULL;
+ PhotoFileFormat* _tmp0_;
#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = file_format;
#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ != NULL) {
-#line 25500 "Photo.c"
- PhotoFileFormat* _tmp1_ = NULL;
- PhotoFileFormatProperties* _tmp2_ = NULL;
- PhotoFileFormatProperties* _tmp3_ = NULL;
- GFile* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
- GFile* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+#line 25491 "Photo.c"
+ PhotoFileFormat* _tmp1_;
+ PhotoFileFormatProperties* _tmp2_;
+ PhotoFileFormatProperties* _tmp3_;
+ GFile* _tmp4_;
+ GFile* _tmp5_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = file_format;
#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25536,26 +25527,26 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
result = _tmp9_;
#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 25538 "Photo.c"
+#line 25529 "Photo.c"
} else {
- PhotoFileFormat _tmp10_ = 0;
- gboolean _tmp11_ = FALSE;
+ PhotoFileFormat _tmp10_;
+ gboolean _tmp11_;
#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = photo_get_file_format (self);
#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = photo_file_format_can_write (_tmp10_);
#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 25548 "Photo.c"
- PhotoFileFormat _tmp12_ = 0;
- PhotoFileFormatProperties* _tmp13_ = NULL;
- PhotoFileFormatProperties* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
- GFile* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
- GFile* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+#line 25539 "Photo.c"
+ PhotoFileFormat _tmp12_;
+ PhotoFileFormatProperties* _tmp13_;
+ PhotoFileFormatProperties* _tmp14_;
+ GFile* _tmp15_;
+ GFile* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_get_file_format (self);
#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25584,17 +25575,17 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
result = _tmp20_;
#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 25586 "Photo.c"
+#line 25577 "Photo.c"
} else {
- PhotoFileFormat _tmp21_ = 0;
- PhotoFileFormatProperties* _tmp22_ = NULL;
- PhotoFileFormatProperties* _tmp23_ = NULL;
- GFile* _tmp24_ = NULL;
- GFile* _tmp25_ = NULL;
- GFile* _tmp26_ = NULL;
- GFile* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
+ PhotoFileFormat _tmp21_;
+ PhotoFileFormatProperties* _tmp22_;
+ PhotoFileFormatProperties* _tmp23_;
+ GFile* _tmp24_;
+ GFile* _tmp25_;
+ GFile* _tmp26_;
+ GFile* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = photo_file_format_get_system_default_format ();
#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25623,7 +25614,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
result = _tmp29_;
#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 25625 "Photo.c"
+#line 25616 "Photo.c"
}
}
}
@@ -25633,49 +25624,49 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
gboolean result = FALSE;
PhotoFileReader* export_reader = NULL;
gboolean is_master = FALSE;
- PhotoFileReader* _tmp30_ = NULL;
+ PhotoFileReader* _tmp30_;
PhotoFileFormatProperties* format_properties = NULL;
- PhotoFileReader* _tmp31_ = NULL;
- PhotoFileFormat _tmp32_ = 0;
- PhotoFileFormatProperties* _tmp33_ = NULL;
+ PhotoFileReader* _tmp31_;
+ PhotoFileFormat _tmp32_;
+ PhotoFileFormatProperties* _tmp33_;
GFile* dest_file = NULL;
- PhotoFileFormatProperties* _tmp34_ = NULL;
- GFile* _tmp35_ = NULL;
- GFile* _tmp36_ = NULL;
+ PhotoFileFormatProperties* _tmp34_;
+ GFile* _tmp35_;
+ GFile* _tmp36_;
PhotoFileMetadataWriter* writer = NULL;
- PhotoFileReader* _tmp37_ = NULL;
- PhotoFileFormat _tmp38_ = 0;
- GFile* _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
- gchar* _tmp41_ = NULL;
- PhotoFileMetadataWriter* _tmp42_ = NULL;
- PhotoFileMetadataWriter* _tmp43_ = NULL;
- gchar* _tmp45_ = NULL;
- gchar* _tmp46_ = NULL;
- PhotoFileMetadataWriter* _tmp47_ = NULL;
- gchar* _tmp48_ = NULL;
- gchar* _tmp49_ = NULL;
- PhotoFileReader* _tmp50_ = NULL;
- GFile* _tmp51_ = NULL;
- GFile* _tmp52_ = NULL;
- GFile* _tmp53_ = NULL;
+ PhotoFileReader* _tmp37_;
+ PhotoFileFormat _tmp38_;
+ GFile* _tmp39_;
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+ PhotoFileMetadataWriter* _tmp42_;
+ PhotoFileMetadataWriter* _tmp43_;
+ gchar* _tmp45_;
+ gchar* _tmp46_;
+ PhotoFileMetadataWriter* _tmp47_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
+ PhotoFileReader* _tmp50_;
+ GFile* _tmp51_;
+ GFile* _tmp52_;
+ GFile* _tmp53_;
gboolean _tmp55_ = FALSE;
gboolean _tmp56_ = FALSE;
gboolean _tmp57_ = FALSE;
gboolean _tmp58_ = FALSE;
gboolean _tmp59_ = FALSE;
- gboolean _tmp60_ = FALSE;
+ gboolean _tmp60_;
PhotoMetadata* metadata = NULL;
- PhotoFileReader* _tmp68_ = NULL;
- PhotoMetadata* _tmp69_ = NULL;
- PhotoMetadata* _tmp71_ = NULL;
- PhotoFileMetadataWriter* _tmp75_ = NULL;
- gchar* _tmp76_ = NULL;
- gchar* _tmp77_ = NULL;
- time_t _tmp78_ = 0;
- gboolean _tmp84_ = FALSE;
- PhotoFileMetadataWriter* _tmp101_ = NULL;
- PhotoMetadata* _tmp102_ = NULL;
+ PhotoFileReader* _tmp68_;
+ PhotoMetadata* _tmp69_;
+ PhotoMetadata* _tmp71_;
+ PhotoFileMetadataWriter* _tmp75_;
+ gchar* _tmp76_;
+ gchar* _tmp77_;
+ time_t _tmp78_;
+ gboolean _tmp84_;
+ PhotoFileMetadataWriter* _tmp101_;
+ PhotoMetadata* _tmp102_;
GError * _inner_error_ = NULL;
#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -25685,29 +25676,29 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
export_reader = NULL;
#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
is_master = TRUE;
-#line 25687 "Photo.c"
+#line 25678 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 25694 "Photo.c"
+#line 25685 "Photo.c"
{
gboolean _tmp1_ = FALSE;
- PhotoBackingReaders* _tmp2_ = NULL;
- PhotoFileReader* _tmp3_ = NULL;
+ PhotoBackingReaders* _tmp2_;
+ PhotoFileReader* _tmp3_;
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->readers;
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp2_->editable;
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp3_ != NULL) {
-#line 25705 "Photo.c"
- PhotoBackingReaders* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
- PhotoFileFormat _tmp6_ = 0;
- gboolean _tmp7_ = FALSE;
+#line 25696 "Photo.c"
+ PhotoBackingReaders* _tmp4_;
+ PhotoFileReader* _tmp5_;
+ PhotoFileFormat _tmp6_;
+ gboolean _tmp7_;
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->readers;
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25718,18 +25709,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp7_ = photo_file_format_can_write_metadata (_tmp6_);
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp7_;
-#line 25720 "Photo.c"
+#line 25711 "Photo.c"
} else {
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 25724 "Photo.c"
+#line 25715 "Photo.c"
}
#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
-#line 25728 "Photo.c"
- PhotoBackingReaders* _tmp8_ = NULL;
- PhotoFileReader* _tmp9_ = NULL;
- PhotoFileReader* _tmp10_ = NULL;
+#line 25719 "Photo.c"
+ PhotoBackingReaders* _tmp8_;
+ PhotoFileReader* _tmp9_;
+ PhotoFileReader* _tmp10_;
#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = self->priv->readers;
#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25742,22 +25733,22 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
export_reader = _tmp10_;
#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
is_master = FALSE;
-#line 25744 "Photo.c"
+#line 25735 "Photo.c"
} else {
gboolean _tmp11_ = FALSE;
- PhotoBackingReaders* _tmp12_ = NULL;
- PhotoFileReader* _tmp13_ = NULL;
+ PhotoBackingReaders* _tmp12_;
+ PhotoFileReader* _tmp13_;
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->priv->readers;
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _tmp12_->developer;
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_ != NULL) {
-#line 25755 "Photo.c"
- PhotoBackingReaders* _tmp14_ = NULL;
- PhotoFileReader* _tmp15_ = NULL;
- PhotoFileFormat _tmp16_ = 0;
- gboolean _tmp17_ = FALSE;
+#line 25746 "Photo.c"
+ PhotoBackingReaders* _tmp14_;
+ PhotoFileReader* _tmp15_;
+ PhotoFileFormat _tmp16_;
+ gboolean _tmp17_;
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->priv->readers;
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25768,18 +25759,18 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp17_ = photo_file_format_can_write_metadata (_tmp16_);
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _tmp17_;
-#line 25770 "Photo.c"
+#line 25761 "Photo.c"
} else {
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = FALSE;
-#line 25774 "Photo.c"
+#line 25765 "Photo.c"
}
#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 25778 "Photo.c"
- PhotoBackingReaders* _tmp18_ = NULL;
- PhotoFileReader* _tmp19_ = NULL;
- PhotoFileReader* _tmp20_ = NULL;
+#line 25769 "Photo.c"
+ PhotoBackingReaders* _tmp18_;
+ PhotoFileReader* _tmp19_;
+ PhotoFileReader* _tmp20_;
#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = self->priv->readers;
#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25792,12 +25783,12 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
export_reader = _tmp20_;
#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
is_master = FALSE;
-#line 25794 "Photo.c"
+#line 25785 "Photo.c"
} else {
- PhotoBackingReaders* _tmp21_ = NULL;
- PhotoFileReader* _tmp22_ = NULL;
- PhotoFileFormat _tmp23_ = 0;
- gboolean _tmp24_ = FALSE;
+ PhotoBackingReaders* _tmp21_;
+ PhotoFileReader* _tmp22_;
+ PhotoFileFormat _tmp23_;
+ gboolean _tmp24_;
#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = self->priv->readers;
#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25808,10 +25799,10 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp24_ = photo_file_format_can_write_metadata (_tmp23_);
#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp24_) {
-#line 25810 "Photo.c"
- PhotoBackingReaders* _tmp25_ = NULL;
- PhotoFileReader* _tmp26_ = NULL;
- PhotoFileReader* _tmp27_ = NULL;
+#line 25801 "Photo.c"
+ PhotoBackingReaders* _tmp25_;
+ PhotoFileReader* _tmp26_;
+ PhotoFileReader* _tmp27_;
#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = self->priv->readers;
#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25822,23 +25813,23 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
export_reader = _tmp27_;
-#line 25824 "Photo.c"
+#line 25815 "Photo.c"
}
}
}
}
- __finally385:
+ __finally386:
{
- PhotoBackingReaders* _tmp28_ = NULL;
+ PhotoBackingReaders* _tmp28_;
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = self->priv->readers;
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25836 "Photo.c"
+#line 25827 "Photo.c"
}
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25840 "Photo.c"
+#line 25831 "Photo.c"
gboolean _tmp29_ = FALSE;
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -25846,7 +25837,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp29_;
-#line 25848 "Photo.c"
+#line 25839 "Photo.c"
}
}
#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25859,7 +25850,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 25861 "Photo.c"
+#line 25852 "Photo.c"
}
#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = export_reader;
@@ -25897,7 +25888,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
writer = _tmp43_;
#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25899 "Photo.c"
+#line 25890 "Photo.c"
gboolean _tmp44_ = FALSE;
#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -25909,7 +25900,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp44_;
-#line 25911 "Photo.c"
+#line 25902 "Photo.c"
}
#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -25941,7 +25932,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_g_object_unref0 (_tmp52_);
#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25943 "Photo.c"
+#line 25934 "Photo.c"
gboolean _tmp54_ = FALSE;
#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -25955,43 +25946,43 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp54_;
-#line 25957 "Photo.c"
+#line 25948 "Photo.c"
}
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp60_ = photo_has_alterations (self);
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp60_) {
-#line 25963 "Photo.c"
- gboolean _tmp61_ = FALSE;
+#line 25954 "Photo.c"
+ gboolean _tmp61_;
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = is_master;
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = _tmp61_;
-#line 25969 "Photo.c"
+#line 25960 "Photo.c"
} else {
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = FALSE;
-#line 25973 "Photo.c"
+#line 25964 "Photo.c"
}
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp59_) {
-#line 25977 "Photo.c"
- gboolean _tmp62_ = FALSE;
+#line 25968 "Photo.c"
+ gboolean _tmp62_;
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp62_ = photo_has_user_generated_metadata (self);
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = !_tmp62_;
-#line 25983 "Photo.c"
+#line 25974 "Photo.c"
} else {
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp58_ = FALSE;
-#line 25987 "Photo.c"
+#line 25978 "Photo.c"
}
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp58_) {
-#line 25991 "Photo.c"
- gchar* _tmp63_ = NULL;
- gchar* _tmp64_ = NULL;
+#line 25982 "Photo.c"
+ gchar* _tmp63_;
+ gchar* _tmp64_;
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26000,17 +25991,17 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp57_ = _tmp64_ == NULL;
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp64_);
-#line 26002 "Photo.c"
+#line 25993 "Photo.c"
} else {
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = FALSE;
-#line 26006 "Photo.c"
+#line 25997 "Photo.c"
}
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp57_) {
-#line 26010 "Photo.c"
- gchar* _tmp65_ = NULL;
- gchar* _tmp66_ = NULL;
+#line 26001 "Photo.c"
+ gchar* _tmp65_;
+ gchar* _tmp66_;
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26019,25 +26010,25 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp56_ = _tmp66_ == NULL;
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp66_);
-#line 26021 "Photo.c"
+#line 26012 "Photo.c"
} else {
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp56_ = FALSE;
-#line 26025 "Photo.c"
+#line 26016 "Photo.c"
}
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp56_) {
-#line 26029 "Photo.c"
- gboolean _tmp67_ = FALSE;
+#line 26020 "Photo.c"
+ gboolean _tmp67_;
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp67_ = export_metadata;
#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = _tmp67_;
-#line 26035 "Photo.c"
+#line 26026 "Photo.c"
} else {
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = FALSE;
-#line 26039 "Photo.c"
+#line 26030 "Photo.c"
}
#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp55_) {
@@ -26053,7 +26044,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 26055 "Photo.c"
+#line 26046 "Photo.c"
}
#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp68_ = export_reader;
@@ -26063,7 +26054,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
metadata = _tmp69_;
#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 26065 "Photo.c"
+#line 26056 "Photo.c"
gboolean _tmp70_ = FALSE;
#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -26077,16 +26068,16 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp70_;
-#line 26079 "Photo.c"
+#line 26070 "Photo.c"
}
#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp71_ = metadata;
#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp71_ == NULL) {
-#line 26085 "Photo.c"
- PhotoFileReader* _tmp72_ = NULL;
- PhotoFileFormat _tmp73_ = 0;
- PhotoMetadata* _tmp74_ = NULL;
+#line 26076 "Photo.c"
+ PhotoFileReader* _tmp72_;
+ PhotoFileFormat _tmp73_;
+ PhotoMetadata* _tmp74_;
#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp72_ = export_reader;
#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26097,7 +26088,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_media_metadata_unref0 (metadata);
#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
metadata = _tmp74_;
-#line 26099 "Photo.c"
+#line 26090 "Photo.c"
}
#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp75_ = writer;
@@ -26113,11 +26104,11 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp78_ != ((time_t) 0)) {
-#line 26115 "Photo.c"
- PhotoMetadata* _tmp79_ = NULL;
- time_t _tmp80_ = 0;
- MetadataDateTime* _tmp81_ = NULL;
- MetadataDateTime* _tmp82_ = NULL;
+#line 26106 "Photo.c"
+ PhotoMetadata* _tmp79_;
+ time_t _tmp80_;
+ MetadataDateTime* _tmp81_;
+ MetadataDateTime* _tmp82_;
#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp79_ = metadata;
#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26130,34 +26121,34 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (_tmp82_);
-#line 26132 "Photo.c"
+#line 26123 "Photo.c"
} else {
- PhotoMetadata* _tmp83_ = NULL;
+ PhotoMetadata* _tmp83_;
#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp83_ = metadata;
#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26139 "Photo.c"
+#line 26130 "Photo.c"
}
#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp84_ = export_metadata;
#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp84_) {
-#line 26145 "Photo.c"
- PhotoMetadata* _tmp85_ = NULL;
- gchar* _tmp86_ = NULL;
- gchar* _tmp87_ = NULL;
- PhotoMetadata* _tmp88_ = NULL;
- gchar* _tmp89_ = NULL;
- gchar* _tmp90_ = NULL;
- PhotoMetadata* _tmp91_ = NULL;
+#line 26136 "Photo.c"
+ PhotoMetadata* _tmp85_;
+ gchar* _tmp86_;
+ gchar* _tmp87_;
+ PhotoMetadata* _tmp88_;
+ gchar* _tmp89_;
+ gchar* _tmp90_;
+ PhotoMetadata* _tmp91_;
Dimensions _tmp92_ = {0};
- PhotoMetadata* _tmp93_ = NULL;
- Orientation _tmp94_ = 0;
- PhotoMetadata* _tmp95_ = NULL;
- Orientation _tmp96_ = 0;
- Orientation _tmp97_ = 0;
- PhotoMetadata* _tmp99_ = NULL;
+ PhotoMetadata* _tmp93_;
+ Orientation _tmp94_;
+ PhotoMetadata* _tmp95_;
+ Orientation _tmp96_;
+ Orientation _tmp97_;
+ PhotoMetadata* _tmp99_;
#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp85_ = metadata;
#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26200,26 +26191,26 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_tmp97_ = photo_get_original_orientation (self);
#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp96_ != _tmp97_) {
-#line 26202 "Photo.c"
- PhotoMetadata* _tmp98_ = NULL;
+#line 26193 "Photo.c"
+ PhotoMetadata* _tmp98_;
#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp98_ = metadata;
#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_remove_exif_thumbnail (_tmp98_);
-#line 26208 "Photo.c"
+#line 26199 "Photo.c"
}
#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp99_ = metadata;
#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_user_metadata_for_export (self, _tmp99_);
-#line 26214 "Photo.c"
+#line 26205 "Photo.c"
} else {
- PhotoMetadata* _tmp100_ = NULL;
+ PhotoMetadata* _tmp100_;
#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp100_ = metadata;
#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_clear (_tmp100_);
-#line 26221 "Photo.c"
+#line 26212 "Photo.c"
}
#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp101_ = writer;
@@ -26229,7 +26220,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_);
#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 26231 "Photo.c"
+#line 26222 "Photo.c"
gboolean _tmp103_ = FALSE;
#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -26245,7 +26236,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp103_;
-#line 26247 "Photo.c"
+#line 26238 "Photo.c"
}
#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
@@ -26261,7 +26252,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
_photo_file_adapter_unref0 (export_reader);
#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 26263 "Photo.c"
+#line 26254 "Photo.c"
}
@@ -26270,7 +26261,7 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26281,99 +26272,97 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
if (!_tmp3_) {
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = TRUE;
-#line 26283 "Photo.c"
+#line 26274 "Photo.c"
} else {
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp4_;
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_has_alterations (self);
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp4_;
-#line 26290 "Photo.c"
+#line 26281 "Photo.c"
}
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = TRUE;
-#line 26296 "Photo.c"
+#line 26287 "Photo.c"
} else {
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = photo_has_user_generated_metadata (self);
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp5_;
-#line 26303 "Photo.c"
+#line 26294 "Photo.c"
}
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = TRUE;
-#line 26309 "Photo.c"
+#line 26300 "Photo.c"
} else {
- PhotoFileFormat _tmp6_ = 0;
- PhotoFileFormat _tmp7_ = 0;
+ PhotoFileFormat _tmp6_;
+ PhotoFileFormat _tmp7_;
#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = export_format;
#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = photo_get_file_format (self);
#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp6_ != _tmp7_;
-#line 26319 "Photo.c"
+#line 26310 "Photo.c"
}
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 26325 "Photo.c"
+#line 26316 "Photo.c"
}
void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
gboolean _tmp4_ = FALSE;
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
+ gboolean _tmp7_;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp18_ = NULL;
- PhotoMetadata* _tmp19_ = NULL;
- PhotoFileFormat _tmp22_ = 0;
- gboolean _tmp23_ = FALSE;
+ PhotoMetadata* _tmp18_;
+ PhotoMetadata* _tmp19_;
+ PhotoFileFormat _tmp22_;
+ gboolean _tmp23_;
PhotoFileWriter* writer = NULL;
- PhotoFileFormat _tmp25_ = 0;
- GFile* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- PhotoFileWriter* _tmp29_ = NULL;
- PhotoFileWriter* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
- PhotoFileWriter* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- PhotoFileFormat _tmp36_ = 0;
+ PhotoFileFormat _tmp25_;
+ GFile* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ PhotoFileWriter* _tmp29_;
+ PhotoFileWriter* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ PhotoFileWriter* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
+ PhotoFileFormat _tmp36_;
GEnumValue* _tmp37_;
GdkPixbuf* pixbuf = NULL;
gboolean _tmp38_ = FALSE;
- PhotoFileFormat _tmp39_ = 0;
- PhotoFileWriter* _tmp49_ = NULL;
- GdkPixbuf* _tmp50_ = NULL;
- JpegQuality _tmp51_ = 0;
- PhotoFileWriter* _tmp52_ = NULL;
- gchar* _tmp53_ = NULL;
- gchar* _tmp54_ = NULL;
- gboolean _tmp55_ = FALSE;
+ PhotoFileFormat _tmp39_;
+ PhotoFileWriter* _tmp49_;
+ GdkPixbuf* _tmp50_;
+ JpegQuality _tmp51_;
+ PhotoFileWriter* _tmp52_;
+ gchar* _tmp53_;
+ gchar* _tmp54_;
+ gboolean _tmp55_;
gboolean _tmp75_ = FALSE;
- PhotoFileFormat _tmp76_ = 0;
+ PhotoFileFormat _tmp76_;
PhotoFileMetadataWriter* _tmp86_ = NULL;
- PhotoFileFormat _tmp87_ = 0;
- GFile* _tmp88_ = NULL;
- gchar* _tmp89_ = NULL;
- gchar* _tmp90_ = NULL;
- PhotoFileMetadataWriter* _tmp91_ = NULL;
- PhotoFileMetadataWriter* _tmp92_ = NULL;
- PhotoFileMetadataWriter* _tmp93_ = NULL;
- PhotoFileMetadataWriter* _tmp94_ = NULL;
- PhotoMetadata* _tmp95_ = NULL;
+ PhotoFileFormat _tmp87_;
+ GFile* _tmp88_;
+ gchar* _tmp89_;
+ gchar* _tmp90_;
+ PhotoFileMetadataWriter* _tmp91_;
+ PhotoFileMetadataWriter* _tmp92_;
+ PhotoMetadata* _tmp93_;
GError * _inner_error_ = NULL;
#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -26385,10 +26374,10 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp0_ = direct_copy_unmodified;
#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_) {
-#line 26387 "Photo.c"
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+#line 26376 "Photo.c"
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26405,80 +26394,80 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
g_propagate_error (error, _inner_error_);
#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26407 "Photo.c"
+#line 26396 "Photo.c"
}
#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26411 "Photo.c"
+#line 26400 "Photo.c"
}
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = scaling_is_unscaled (scaling);
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_) {
-#line 26417 "Photo.c"
+#line 26406 "Photo.c"
gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
+ gboolean _tmp9_;
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = photo_has_alterations (self);
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp9_) {
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = TRUE;
-#line 26426 "Photo.c"
+#line 26415 "Photo.c"
} else {
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp10_;
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = photo_only_metadata_changed (self);
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _tmp10_;
-#line 26433 "Photo.c"
+#line 26422 "Photo.c"
}
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp8_;
-#line 26437 "Photo.c"
+#line 26426 "Photo.c"
} else {
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = FALSE;
-#line 26441 "Photo.c"
+#line 26430 "Photo.c"
}
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_) {
-#line 26445 "Photo.c"
- PhotoFileFormat _tmp11_ = 0;
- PhotoFileFormat _tmp12_ = 0;
+#line 26434 "Photo.c"
+ PhotoFileFormat _tmp11_;
+ PhotoFileFormat _tmp12_;
#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = export_format;
#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_get_file_format (self);
#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp11_ == _tmp12_;
-#line 26454 "Photo.c"
+#line 26443 "Photo.c"
} else {
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = FALSE;
-#line 26458 "Photo.c"
+#line 26447 "Photo.c"
}
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 26462 "Photo.c"
- PhotoFileFormat _tmp13_ = 0;
+#line 26451 "Photo.c"
+ PhotoFileFormat _tmp13_;
#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = photo_get_file_format (self);
#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF;
-#line 26468 "Photo.c"
+#line 26457 "Photo.c"
} else {
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = FALSE;
-#line 26472 "Photo.c"
+#line 26461 "Photo.c"
}
#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp4_) {
-#line 26476 "Photo.c"
+#line 26465 "Photo.c"
gboolean _tmp14_ = FALSE;
- GFile* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
- gboolean _tmp17_ = FALSE;
+ GFile* _tmp15_;
+ gboolean _tmp16_;
+ gboolean _tmp17_;
#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = dest_file;
#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26493,13 +26482,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
g_propagate_error (error, _inner_error_);
#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26495 "Photo.c"
+#line 26484 "Photo.c"
}
#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_) {
#line 3662 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26501 "Photo.c"
+#line 26490 "Photo.c"
}
}
#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26510,9 +26499,9 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp19_ = metadata;
#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp19_ == NULL) {
-#line 26512 "Photo.c"
- PhotoFileFormat _tmp20_ = 0;
- PhotoMetadata* _tmp21_ = NULL;
+#line 26501 "Photo.c"
+ PhotoFileFormat _tmp20_;
+ PhotoMetadata* _tmp21_;
#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = export_format;
#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26521,7 +26510,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
metadata = _tmp21_;
-#line 26523 "Photo.c"
+#line 26512 "Photo.c"
}
#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = export_format;
@@ -26529,13 +26518,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp23_ = photo_file_format_can_write (_tmp22_);
#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp23_) {
-#line 26531 "Photo.c"
- PhotoFileFormat _tmp24_ = 0;
+#line 26520 "Photo.c"
+ PhotoFileFormat _tmp24_;
#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = photo_file_format_get_system_default_format ();
#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
export_format = _tmp24_;
-#line 26537 "Photo.c"
+#line 26526 "Photo.c"
}
#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = export_format;
@@ -26561,7 +26550,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26563 "Photo.c"
+#line 26552 "Photo.c"
}
#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -26590,22 +26579,22 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) {
#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = TRUE;
-#line 26591 "Photo.c"
+#line 26580 "Photo.c"
} else {
- PhotoFileFormat _tmp40_ = 0;
+ PhotoFileFormat _tmp40_;
#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = photo_get_file_format (self);
#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW;
-#line 26598 "Photo.c"
+#line 26587 "Photo.c"
}
#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp38_) {
-#line 26602 "Photo.c"
+#line 26591 "Photo.c"
GdkPixbuf* _tmp41_ = NULL;
- Scaling _tmp42_ = {0};
- GdkPixbuf* _tmp43_ = NULL;
- GdkPixbuf* _tmp44_ = NULL;
+ Scaling _tmp42_;
+ GdkPixbuf* _tmp43_;
+ GdkPixbuf* _tmp44_;
#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = *scaling;
#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26624,7 +26613,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26625 "Photo.c"
+#line 26614 "Photo.c"
}
#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp44_ = _tmp41_;
@@ -26636,12 +26625,12 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
pixbuf = _tmp44_;
#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp41_);
-#line 26637 "Photo.c"
+#line 26626 "Photo.c"
} else {
GdkPixbuf* _tmp45_ = NULL;
- Scaling _tmp46_ = {0};
- GdkPixbuf* _tmp47_ = NULL;
- GdkPixbuf* _tmp48_ = NULL;
+ Scaling _tmp46_;
+ GdkPixbuf* _tmp47_;
+ GdkPixbuf* _tmp48_;
#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = *scaling;
#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26660,7 +26649,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26661 "Photo.c"
+#line 26650 "Photo.c"
}
#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp48_ = _tmp45_;
@@ -26672,7 +26661,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
pixbuf = _tmp48_;
#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp45_);
-#line 26673 "Photo.c"
+#line 26662 "Photo.c"
}
#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = writer;
@@ -26694,7 +26683,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26695 "Photo.c"
+#line 26684 "Photo.c"
}
#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = writer;
@@ -26710,19 +26699,19 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp55_ = export_metadata;
#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp55_) {
-#line 26711 "Photo.c"
- PhotoMetadata* _tmp56_ = NULL;
- gchar* _tmp57_ = NULL;
- gchar* _tmp58_ = NULL;
- PhotoMetadata* _tmp59_ = NULL;
- gchar* _tmp60_ = NULL;
- gchar* _tmp61_ = NULL;
- PhotoMetadata* _tmp62_ = NULL;
- time_t _tmp63_ = 0;
- PhotoMetadata* _tmp69_ = NULL;
- PhotoMetadata* _tmp70_ = NULL;
- PhotoMetadata* _tmp71_ = NULL;
- gboolean _tmp72_ = FALSE;
+#line 26700 "Photo.c"
+ PhotoMetadata* _tmp56_;
+ gchar* _tmp57_;
+ gchar* _tmp58_;
+ PhotoMetadata* _tmp59_;
+ gchar* _tmp60_;
+ gchar* _tmp61_;
+ PhotoMetadata* _tmp62_;
+ time_t _tmp63_;
+ PhotoMetadata* _tmp69_;
+ PhotoMetadata* _tmp70_;
+ PhotoMetadata* _tmp71_;
+ gboolean _tmp72_;
#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp56_ = metadata;
#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26751,11 +26740,11 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp63_ != ((time_t) 0)) {
-#line 26752 "Photo.c"
- PhotoMetadata* _tmp64_ = NULL;
- time_t _tmp65_ = 0;
- MetadataDateTime* _tmp66_ = NULL;
- MetadataDateTime* _tmp67_ = NULL;
+#line 26741 "Photo.c"
+ PhotoMetadata* _tmp64_;
+ time_t _tmp65_;
+ MetadataDateTime* _tmp66_;
+ MetadataDateTime* _tmp67_;
#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp64_ = metadata;
#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26768,14 +26757,14 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
_metadata_date_time_unref0 (_tmp67_);
-#line 26769 "Photo.c"
+#line 26758 "Photo.c"
} else {
- PhotoMetadata* _tmp68_ = NULL;
+ PhotoMetadata* _tmp68_;
#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp68_ = metadata;
#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26776 "Photo.c"
+#line 26765 "Photo.c"
}
#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = metadata;
@@ -26793,21 +26782,21 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp72_ = photo_has_user_generated_metadata (self);
#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp72_) {
-#line 26794 "Photo.c"
- PhotoMetadata* _tmp73_ = NULL;
+#line 26783 "Photo.c"
+ PhotoMetadata* _tmp73_;
#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp73_ = metadata;
#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_user_metadata_for_export (self, _tmp73_);
-#line 26800 "Photo.c"
+#line 26789 "Photo.c"
}
} else {
- PhotoMetadata* _tmp74_ = NULL;
+ PhotoMetadata* _tmp74_;
#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp74_ = metadata;
#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_clear (_tmp74_);
-#line 26808 "Photo.c"
+#line 26797 "Photo.c"
}
#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp76_ = photo_get_file_format (self);
@@ -26815,22 +26804,22 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) {
#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp75_ = TRUE;
-#line 26816 "Photo.c"
+#line 26805 "Photo.c"
} else {
- PhotoFileFormat _tmp77_ = 0;
+ PhotoFileFormat _tmp77_;
#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp77_ = photo_get_file_format (self);
#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW;
-#line 26823 "Photo.c"
+#line 26812 "Photo.c"
}
#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp75_) {
-#line 26827 "Photo.c"
- PhotoMetadata* _tmp78_ = NULL;
+#line 26816 "Photo.c"
+ PhotoMetadata* _tmp78_;
Dimensions _tmp79_ = {0};
- PhotoMetadata* _tmp80_ = NULL;
- Orientation _tmp81_ = 0;
+ PhotoMetadata* _tmp80_;
+ Orientation _tmp81_;
#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = metadata;
#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26843,12 +26832,12 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp81_ = photo_get_orientation (self);
#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_set_orientation (_tmp80_, _tmp81_);
-#line 26844 "Photo.c"
+#line 26833 "Photo.c"
} else {
- PhotoMetadata* _tmp82_ = NULL;
- GdkPixbuf* _tmp83_ = NULL;
+ PhotoMetadata* _tmp82_;
+ GdkPixbuf* _tmp83_;
Dimensions _tmp84_ = {0};
- PhotoMetadata* _tmp85_ = NULL;
+ PhotoMetadata* _tmp85_;
#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp82_ = metadata;
#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26861,7 +26850,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_tmp85_ = metadata;
#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT);
-#line 26862 "Photo.c"
+#line 26851 "Photo.c"
}
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp87_ = export_format;
@@ -26891,20 +26880,12 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26892 "Photo.c"
+#line 26881 "Photo.c"
}
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp93_ = _tmp86_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp86_ = NULL;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp94_ = _tmp93_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp95_ = metadata;
+ _tmp93_ = metadata;
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
- photo_file_metadata_writer_write_metadata (_tmp94_, _tmp95_, &_inner_error_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
- _photo_file_adapter_unref0 (_tmp94_);
+ photo_file_metadata_writer_write_metadata (_tmp86_, _tmp93_, &_inner_error_);
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26919,7 +26900,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_media_metadata_unref0 (metadata);
#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 26920 "Photo.c"
+#line 26901 "Photo.c"
}
#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (_tmp86_);
@@ -26929,7 +26910,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
_photo_file_adapter_unref0 (writer);
#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (metadata);
-#line 26930 "Photo.c"
+#line 26911 "Photo.c"
}
@@ -26937,43 +26918,42 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
PhotoFileFormat _vala_file_format = 0;
GFile* result = NULL;
GFile* backing = NULL;
- PhotoFileFormat _tmp4_ = 0;
- gboolean _tmp5_ = FALSE;
+ PhotoFileFormat _tmp4_;
+ gboolean _tmp5_;
gchar* name = NULL;
gchar* ext = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
gboolean _tmp11_ = FALSE;
- const gchar* _tmp12_ = NULL;
+ const gchar* _tmp12_;
gchar* editable_basename = NULL;
- const gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
gboolean collision = FALSE;
- GFile* _tmp26_ = NULL;
- GFile* _tmp27_ = NULL;
- GFile* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
- GFile* _tmp30_ = NULL;
- GFile* _tmp31_ = NULL;
- GFile* _tmp32_ = NULL;
+ GFile* _tmp25_ = NULL;
+ GFile* _tmp26_;
+ GFile* _tmp27_;
+ gboolean _tmp28_ = FALSE;
+ GFile* _tmp29_;
+ GFile* _tmp30_;
+ GFile* _tmp31_;
GError * _inner_error_ = NULL;
#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26964 "Photo.c"
+#line 26944 "Photo.c"
{
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->row;
#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 26971 "Photo.c"
+#line 26951 "Photo.c"
{
- PhotoFileFormat _tmp1_ = 0;
- GFile* _tmp2_ = NULL;
+ PhotoFileFormat _tmp1_;
+ GFile* _tmp2_;
#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_get_file_format (self);
#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26984,16 +26964,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
_g_object_unref0 (backing);
#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
backing = _tmp2_;
-#line 26985 "Photo.c"
+#line 26965 "Photo.c"
}
- __finally386:
+ __finally387:
{
- PhotoRow* _tmp3_ = NULL;
+ PhotoRow* _tmp3_;
#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->row;
#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26994 "Photo.c"
+#line 26974 "Photo.c"
}
#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -27003,7 +26983,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
_g_object_unref0 (backing);
#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 27004 "Photo.c"
+#line 26984 "Photo.c"
}
}
#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27012,13 +26992,13 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
_tmp5_ = photo_file_format_can_write (_tmp4_);
#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp5_) {
-#line 27013 "Photo.c"
- PhotoFileFormat _tmp6_ = 0;
+#line 26993 "Photo.c"
+ PhotoFileFormat _tmp6_;
#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = photo_file_format_get_system_default_format ();
#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_file_format = _tmp6_;
-#line 27019 "Photo.c"
+#line 26999 "Photo.c"
}
#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = g_file_get_basename (backing);
@@ -27042,13 +27022,13 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
if (_tmp12_ == NULL) {
#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = TRUE;
-#line 27043 "Photo.c"
+#line 27023 "Photo.c"
} else {
- PhotoFileFormat _tmp13_ = 0;
- PhotoFileFormatProperties* _tmp14_ = NULL;
- PhotoFileFormatProperties* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
+ PhotoFileFormat _tmp13_;
+ PhotoFileFormatProperties* _tmp14_;
+ PhotoFileFormatProperties* _tmp15_;
+ const gchar* _tmp16_;
+ gboolean _tmp17_;
#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _vala_file_format;
#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27063,15 +27043,15 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
_tmp11_ = !_tmp17_;
#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_format_properties_unref0 (_tmp15_);
-#line 27064 "Photo.c"
+#line 27044 "Photo.c"
}
#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_) {
-#line 27068 "Photo.c"
- PhotoFileFormat _tmp18_ = 0;
- PhotoFileFormatProperties* _tmp19_ = NULL;
- PhotoFileFormatProperties* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
+#line 27048 "Photo.c"
+ PhotoFileFormat _tmp18_;
+ PhotoFileFormatProperties* _tmp19_;
+ PhotoFileFormatProperties* _tmp20_;
+ gchar* _tmp21_;
#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = _vala_file_format;
#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27086,32 +27066,30 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
ext = _tmp21_;
#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_format_properties_unref0 (_tmp20_);
-#line 27087 "Photo.c"
+#line 27067 "Photo.c"
}
#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = name;
#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp23_ = _ ("modified");
+ _tmp23_ = ext;
#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp24_ = ext;
+ _tmp24_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _ ("modified"), _tmp23_);
#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp25_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _tmp23_, _tmp24_);
-#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
- editable_basename = _tmp25_;
+ editable_basename = _tmp24_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp27_ = g_file_get_parent (backing);
+ _tmp26_ = g_file_get_parent (backing);
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp28_ = _tmp27_;
+ _tmp27_ = _tmp26_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp30_ = generate_unique_file (_tmp28_, editable_basename, &_tmp29_, &_inner_error_);
+ _tmp29_ = generate_unique_file (_tmp27_, editable_basename, &_tmp28_, &_inner_error_);
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- collision = _tmp29_;
+ collision = _tmp28_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp31_ = _tmp30_;
+ _tmp30_ = _tmp29_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _g_object_unref0 (_tmp28_);
+ _g_object_unref0 (_tmp27_);
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp26_ = _tmp31_;
+ _tmp25_ = _tmp30_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27126,16 +27104,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
_g_object_unref0 (backing);
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 27127 "Photo.c"
+#line 27105 "Photo.c"
}
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp32_ = _tmp26_;
+ _tmp31_ = _tmp25_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _tmp26_ = NULL;
+ _tmp25_ = NULL;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- result = _tmp32_;
+ result = _tmp31_;
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
- _g_object_unref0 (_tmp26_);
+ _g_object_unref0 (_tmp25_);
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (editable_basename);
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27148,18 +27126,18 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
if (file_format) {
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
*file_format = _vala_file_format;
-#line 27149 "Photo.c"
+#line 27127 "Photo.c"
}
#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 27153 "Photo.c"
+#line 27131 "Photo.c"
}
static void _g_object_unref0_ (gpointer var) {
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 27160 "Photo.c"
+#line 27138 "Photo.c"
}
@@ -27168,43 +27146,43 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
g_list_free (self);
-#line 27169 "Photo.c"
+#line 27147 "Photo.c"
}
static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, GError** error) {
gboolean result = FALSE;
gchar* _tmp0_ = NULL;
- PhotoFileFormat _tmp1_ = 0;
+ PhotoFileFormat _tmp1_;
gchar* commandline = NULL;
- gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+ gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gboolean _tmp10_;
GAppInfo* app = NULL;
GList* files = NULL;
- GFile* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
- GAppInfo* _tmp18_ = NULL;
+ GFile* _tmp16_;
+ GFile* _tmp17_;
+ GAppInfo* _tmp18_;
gchar** argv = NULL;
- gchar** _tmp24_ = NULL;
- gint argv_length1 = 0;
- gint _argv_size_ = 0;
- gchar** _tmp25_ = NULL;
- gint _tmp25__length1 = 0;
- const gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gchar** _tmp29_ = NULL;
- gint _tmp29__length1 = 0;
- GFile* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
+ gchar** _tmp24_;
+ gint argv_length1;
+ gint _argv_size_;
+ gchar** _tmp25_;
+ gint _tmp25__length1;
+ const gchar* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ gchar** _tmp29_;
+ gint _tmp29__length1;
+ GFile* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
GPid child_pid = 0;
gboolean _tmp33_ = FALSE;
- gchar** _tmp34_ = NULL;
- gint _tmp34__length1 = 0;
+ gchar** _tmp34_;
+ gint _tmp34__length1;
GPid _tmp35_ = 0;
- gboolean _tmp36_ = FALSE;
+ gboolean _tmp36_;
GError * _inner_error_ = NULL;
#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -27212,10 +27190,10 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp1_ = file_format;
#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 27213 "Photo.c"
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+#line 27191 "Photo.c"
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ gchar* _tmp4_;
#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = config_facade_get_instance ();
#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27228,11 +27206,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp0_ = _tmp4_;
#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp3_);
-#line 27229 "Photo.c"
+#line 27207 "Photo.c"
} else {
- ConfigFacade* _tmp5_ = NULL;
- ConfigFacade* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ ConfigFacade* _tmp5_;
+ ConfigFacade* _tmp6_;
+ gchar* _tmp7_;
#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = config_facade_get_instance ();
#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27245,7 +27223,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp0_ = _tmp7_;
#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp6_);
-#line 27246 "Photo.c"
+#line 27224 "Photo.c"
}
#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = g_strdup (_tmp0_);
@@ -27265,13 +27243,13 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_g_free0 (_tmp0_);
#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 27266 "Photo.c"
+#line 27244 "Photo.c"
}
{
GAppInfo* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- GAppInfo* _tmp13_ = NULL;
- GAppInfo* _tmp14_ = NULL;
+ const gchar* _tmp12_;
+ GAppInfo* _tmp13_;
+ GAppInfo* _tmp14_;
#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = commandline;
#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27280,8 +27258,8 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp11_ = _tmp13_;
#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27281 "Photo.c"
- goto __catch387_g_error;
+#line 27259 "Photo.c"
+ goto __catch388_g_error;
}
#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = _tmp11_;
@@ -27293,10 +27271,10 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
app = _tmp14_;
#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp11_);
-#line 27294 "Photo.c"
+#line 27272 "Photo.c"
}
- goto __finally387;
- __catch387_g_error:
+ goto __finally388;
+ __catch388_g_error:
{
GError* er = NULL;
#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27309,12 +27287,12 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
app = NULL;
#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (er);
-#line 27310 "Photo.c"
+#line 27288 "Photo.c"
}
- __finally387:
+ __finally388:
#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27315 "Photo.c"
+#line 27293 "Photo.c"
gboolean _tmp15_ = FALSE;
#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -27326,7 +27304,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_g_free0 (_tmp0_);
#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp15_;
-#line 27327 "Photo.c"
+#line 27305 "Photo.c"
}
#line 3776 "/home/jens/Source/shotwell/src/Photo.vala"
files = NULL;
@@ -27340,11 +27318,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp18_ = app;
#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_ != NULL) {
-#line 27341 "Photo.c"
+#line 27319 "Photo.c"
gboolean _tmp19_ = FALSE;
- GAppInfo* _tmp20_ = NULL;
- GList* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
+ GAppInfo* _tmp20_;
+ GList* _tmp21_;
+ gboolean _tmp22_;
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = app;
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27355,7 +27333,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp19_ = _tmp22_;
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27356 "Photo.c"
+#line 27334 "Photo.c"
gboolean _tmp23_ = FALSE;
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -27369,7 +27347,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_g_free0 (_tmp0_);
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp23_;
-#line 27370 "Photo.c"
+#line 27348 "Photo.c"
}
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp19_;
@@ -27383,7 +27361,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_g_free0 (_tmp0_);
#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 27384 "Photo.c"
+#line 27362 "Photo.c"
}
#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = g_new0 (gchar*, 2 + 1);
@@ -27433,7 +27411,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_tmp33_ = _tmp36_;
#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27434 "Photo.c"
+#line 27412 "Photo.c"
gboolean _tmp37_ = FALSE;
#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
@@ -27449,7 +27427,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_g_free0 (_tmp0_);
#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp37_;
-#line 27450 "Photo.c"
+#line 27428 "Photo.c"
}
#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp33_;
@@ -27465,14 +27443,14 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
_g_free0 (_tmp0_);
#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 27466 "Photo.c"
+#line 27444 "Photo.c"
}
void photo_open_with_raw_external_editor (Photo* self, GError** error) {
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ PhotoFileFormat _tmp2_;
GError * _inner_error_ = NULL;
#line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -27492,7 +27470,7 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27493 "Photo.c"
+#line 27471 "Photo.c"
}
}
@@ -27503,13 +27481,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
PhotoFileFormat editable_file_format = 0;
gboolean _tmp15_ = FALSE;
gboolean _tmp16_ = FALSE;
- GFile* _tmp17_ = NULL;
+ GFile* _tmp17_;
gboolean _tmp25_ = FALSE;
- GFile* _tmp26_ = NULL;
- GFile* _tmp44_ = NULL;
- GFileMonitor* _tmp45_ = NULL;
- GFile* _tmp47_ = NULL;
- PhotoFileFormat _tmp48_ = 0;
+ GFile* _tmp26_;
+ GFile* _tmp44_;
+ GFileMonitor* _tmp45_;
+ GFile* _tmp47_;
+ PhotoFileFormat _tmp48_;
GError * _inner_error_ = NULL;
#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -27517,28 +27495,28 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
current_editable_file = NULL;
#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
create_editable_file = NULL;
-#line 27518 "Photo.c"
+#line 27496 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 27525 "Photo.c"
+#line 27503 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- GFile* _tmp6_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ GFile* _tmp6_;
#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 27536 "Photo.c"
- PhotoBackingReaders* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
+#line 27514 "Photo.c"
+ PhotoBackingReaders* _tmp3_;
+ PhotoFileReader* _tmp4_;
+ GFile* _tmp5_;
#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27549,17 +27527,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
current_editable_file = _tmp5_;
-#line 27550 "Photo.c"
+#line 27528 "Photo.c"
}
#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = current_editable_file;
#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ == NULL) {
-#line 27556 "Photo.c"
+#line 27534 "Photo.c"
GFile* _tmp7_ = NULL;
PhotoFileFormat _tmp8_ = 0;
- GFile* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
+ GFile* _tmp9_;
+ GFile* _tmp10_;
#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_);
#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27568,8 +27546,8 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_tmp7_ = _tmp9_;
#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27569 "Photo.c"
- goto __finally388;
+#line 27547 "Photo.c"
+ goto __finally389;
}
#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = _tmp7_;
@@ -27581,11 +27559,11 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
create_editable_file = _tmp10_;
#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp7_);
-#line 27582 "Photo.c"
+#line 27560 "Photo.c"
} else {
- PhotoBackingReaders* _tmp11_ = NULL;
- PhotoFileReader* _tmp12_ = NULL;
- PhotoFileFormat _tmp13_ = 0;
+ PhotoBackingReaders* _tmp11_;
+ PhotoFileReader* _tmp12_;
+ PhotoFileFormat _tmp13_;
#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->priv->readers;
#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27594,17 +27572,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
editable_file_format = _tmp13_;
-#line 27595 "Photo.c"
+#line 27573 "Photo.c"
}
}
- __finally388:
+ __finally389:
{
- PhotoBackingReaders* _tmp14_ = NULL;
+ PhotoBackingReaders* _tmp14_;
#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = self->priv->readers;
#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27605 "Photo.c"
+#line 27583 "Photo.c"
}
#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -27616,31 +27594,31 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27617 "Photo.c"
+#line 27595 "Photo.c"
}
}
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = create_editable_file;
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp17_ == NULL) {
-#line 27624 "Photo.c"
- GFile* _tmp18_ = NULL;
+#line 27602 "Photo.c"
+ GFile* _tmp18_;
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = current_editable_file;
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = _tmp18_ != NULL;
-#line 27630 "Photo.c"
+#line 27608 "Photo.c"
} else {
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = FALSE;
-#line 27634 "Photo.c"
+#line 27612 "Photo.c"
}
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp16_) {
-#line 27638 "Photo.c"
+#line 27616 "Photo.c"
gboolean _tmp19_ = FALSE;
- GFile* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+ GFile* _tmp20_;
+ gboolean _tmp21_;
#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = current_editable_file;
#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27649,28 +27627,28 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
if (!_tmp21_) {
#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = TRUE;
-#line 27650 "Photo.c"
+#line 27628 "Photo.c"
} else {
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp22_;
#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = photo_has_transformations (self);
#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = _tmp22_;
-#line 27657 "Photo.c"
+#line 27635 "Photo.c"
}
#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = _tmp19_;
-#line 27661 "Photo.c"
+#line 27639 "Photo.c"
} else {
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = FALSE;
-#line 27665 "Photo.c"
+#line 27643 "Photo.c"
}
#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_) {
-#line 27669 "Photo.c"
- GFile* _tmp23_ = NULL;
- GFile* _tmp24_ = NULL;
+#line 27647 "Photo.c"
+ GFile* _tmp23_;
+ GFile* _tmp24_;
#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = current_editable_file;
#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27679,41 +27657,41 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (create_editable_file);
#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
create_editable_file = _tmp24_;
-#line 27680 "Photo.c"
+#line 27658 "Photo.c"
}
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = create_editable_file;
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp26_ != NULL) {
-#line 27686 "Photo.c"
- PhotoFileFormat _tmp27_ = 0;
- gboolean _tmp28_ = FALSE;
+#line 27664 "Photo.c"
+ PhotoFileFormat _tmp27_;
+ gboolean _tmp28_;
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = editable_file_format;
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = photo_file_format_can_write (_tmp27_);
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = _tmp28_;
-#line 27695 "Photo.c"
+#line 27673 "Photo.c"
} else {
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = FALSE;
-#line 27699 "Photo.c"
+#line 27677 "Photo.c"
}
#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp25_) {
-#line 27703 "Photo.c"
- PhotoFileFormat _tmp40_ = 0;
- GFile* _tmp41_ = NULL;
- GFile* _tmp42_ = NULL;
- GFile* _tmp43_ = NULL;
+#line 27681 "Photo.c"
+ PhotoFileFormat _tmp40_;
+ GFile* _tmp41_;
+ GFile* _tmp42_;
+ GFile* _tmp43_;
#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
photo_halt_monitoring_editable (self);
-#line 27710 "Photo.c"
+#line 27688 "Photo.c"
{
- GFile* _tmp29_ = NULL;
+ GFile* _tmp29_;
Scaling _tmp30_ = {0};
- PhotoFileFormat _tmp31_ = 0;
+ PhotoFileFormat _tmp31_;
#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = create_editable_file;
#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27724,42 +27702,42 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_);
#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27725 "Photo.c"
- goto __catch389_g_error;
+#line 27703 "Photo.c"
+ goto __catch390_g_error;
}
}
- goto __finally389;
- __catch389_g_error:
+ goto __finally390;
+ __catch390_g_error:
{
GError* err = NULL;
- GError* _tmp38_ = NULL;
- GError* _tmp39_ = NULL;
+ GError* _tmp38_;
+ GError* _tmp39_;
#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
_inner_error_ = NULL;
-#line 27739 "Photo.c"
+#line 27717 "Photo.c"
{
- GFile* _tmp32_ = NULL;
+ GFile* _tmp32_;
#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = create_editable_file;
#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
g_file_delete (_tmp32_, NULL, &_inner_error_);
#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27748 "Photo.c"
- goto __catch390_g_error;
+#line 27726 "Photo.c"
+ goto __catch391_g_error;
}
}
- goto __finally390;
- __catch390_g_error:
+ goto __finally391;
+ __catch391_g_error:
{
GError* delete_err = NULL;
- GFile* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- GError* _tmp36_ = NULL;
- const gchar* _tmp37_ = NULL;
+ GFile* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
+ GError* _tmp36_;
+ const gchar* _tmp37_;
#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
delete_err = _inner_error_;
#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27781,9 +27759,9 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_free0 (_tmp35_);
#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (delete_err);
-#line 27781 "Photo.c"
+#line 27759 "Photo.c"
}
- __finally390:
+ __finally391:
#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27800,7 +27778,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
g_clear_error (&_inner_error_);
#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27800 "Photo.c"
+#line 27778 "Photo.c"
}
#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = err;
@@ -27810,10 +27788,10 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_inner_error_ = _tmp39_;
#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 27810 "Photo.c"
- goto __finally389;
+#line 27788 "Photo.c"
+ goto __finally390;
}
- __finally389:
+ __finally390:
#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27824,7 +27802,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27824 "Photo.c"
+#line 27802 "Photo.c"
}
#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = editable_file_format;
@@ -27842,7 +27820,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27842 "Photo.c"
+#line 27820 "Photo.c"
}
#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = create_editable_file;
@@ -27852,7 +27830,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
current_editable_file = _tmp43_;
-#line 27852 "Photo.c"
+#line 27830 "Photo.c"
}
#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp44_ = current_editable_file;
@@ -27862,8 +27840,8 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_tmp45_ = self->priv->editable_monitor;
#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp45_ == NULL) {
-#line 27862 "Photo.c"
- GFile* _tmp46_ = NULL;
+#line 27840 "Photo.c"
+ GFile* _tmp46_;
#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = current_editable_file;
#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27878,7 +27856,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27878 "Photo.c"
+#line 27856 "Photo.c"
}
}
#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27897,42 +27875,42 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
_g_object_unref0 (current_editable_file);
#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27897 "Photo.c"
+#line 27875 "Photo.c"
}
#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (create_editable_file);
#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (current_editable_file);
-#line 27903 "Photo.c"
+#line 27881 "Photo.c"
}
void photo_revert_to_master (Photo* self, gboolean notify) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 3858 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = notify;
#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27915 "Photo.c"
+#line 27893 "Photo.c"
}
static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type);
-#line 27922 "Photo.c"
+#line 27900 "Photo.c"
}
static void photo_start_monitoring_editable (Photo* self, GFile* file, GError** error) {
- GFile* _tmp0_ = NULL;
+ GFile* _tmp0_;
GFileMonitor* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFileMonitor* _tmp3_ = NULL;
- GFileMonitor* _tmp4_ = NULL;
- GFileMonitor* _tmp5_ = NULL;
+ GFile* _tmp2_;
+ GFileMonitor* _tmp3_;
+ GFileMonitor* _tmp4_;
+ GFileMonitor* _tmp5_;
GError * _inner_error_ = NULL;
#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -27956,7 +27934,7 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
g_propagate_error (error, _inner_error_);
#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27956 "Photo.c"
+#line 27934 "Photo.c"
}
#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp1_;
@@ -27972,18 +27950,18 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0);
#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp1_);
-#line 27972 "Photo.c"
+#line 27950 "Photo.c"
}
static void photo_halt_monitoring_editable (Photo* self) {
- GFileMonitor* _tmp0_ = NULL;
+ GFileMonitor* _tmp0_;
GFile* file = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFileMonitor* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- GFileMonitor* _tmp6_ = NULL;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ GFileMonitor* _tmp4_;
+ guint _tmp5_;
+ GFileMonitor* _tmp6_;
#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27992,7 +27970,7 @@ static void photo_halt_monitoring_editable (Photo* self) {
if (_tmp0_ == NULL) {
#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 27992 "Photo.c"
+#line 27970 "Photo.c"
}
#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_get_editable_file (self);
@@ -28002,13 +27980,13 @@ static void photo_halt_monitoring_editable (Photo* self) {
_tmp2_ = file;
#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 28002 "Photo.c"
- GFile* _tmp3_ = NULL;
+#line 27980 "Photo.c"
+ GFile* _tmp3_;
#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = file;
#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
library_monitor_unblacklist_file (_tmp3_);
-#line 28008 "Photo.c"
+#line 27986 "Photo.c"
}
#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->editable_monitor;
@@ -28026,17 +28004,17 @@ static void photo_halt_monitoring_editable (Photo* self) {
self->priv->editable_monitor = NULL;
#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (file);
-#line 28026 "Photo.c"
+#line 28004 "Photo.c"
}
static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFile* file, GError** error) {
- PhotoFileFormat _tmp0_ = 0;
- GFile* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
+ PhotoFileFormat _tmp0_;
+ GFile* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PhotoFileReader* _tmp4_;
+ PhotoFileReader* _tmp5_;
GError * _inner_error_ = NULL;
#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -28068,7 +28046,7 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi
g_propagate_error (error, _inner_error_);
#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28068 "Photo.c"
+#line 28046 "Photo.c"
}
}
@@ -28085,7 +28063,7 @@ static void photo_update_editable_attributes (Photo* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28085 "Photo.c"
+#line 28063 "Photo.c"
}
}
@@ -28102,151 +28080,151 @@ void photo_reimport_editable (Photo* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28102 "Photo.c"
+#line 28080 "Photo.c"
}
}
-static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) {
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28114 "Photo.c"
+#line 28092 "Photo.c"
}
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 28120 "Photo.c"
+#line 28098 "Photo.c"
}
-static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) {
#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28131 "Photo.c"
+#line 28109 "Photo.c"
}
#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 28137 "Photo.c"
+#line 28115 "Photo.c"
}
-static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) {
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28148 "Photo.c"
+#line 28126 "Photo.c"
}
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 28154 "Photo.c"
+#line 28132 "Photo.c"
}
-static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) {
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28165 "Photo.c"
+#line 28143 "Photo.c"
}
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 28171 "Photo.c"
+#line 28149 "Photo.c"
}
-static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) {
#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28182 "Photo.c"
+#line 28160 "Photo.c"
}
#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 28188 "Photo.c"
+#line 28166 "Photo.c"
}
-static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) {
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
if ((*length) == (*size)) {
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28199 "Photo.c"
+#line 28177 "Photo.c"
}
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[(*length)++] = value;
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
(*array)[*length] = NULL;
-#line 28205 "Photo.c"
+#line 28183 "Photo.c"
}
static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoFileReader* new_reader, GError** error) {
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
PhotoFileReader* old_reader = NULL;
- PhotoFileReader* _tmp5_ = NULL;
+ PhotoFileReader* _tmp5_;
PhotoFileReader* _tmp6_ = NULL;
- PhotoFileReader* _tmp7_ = NULL;
+ PhotoFileReader* _tmp7_;
PhotoFileReader* reader = NULL;
- PhotoFileReader* _tmp9_ = NULL;
- PhotoFileReader* _tmp10_ = NULL;
+ PhotoFileReader* _tmp9_;
+ PhotoFileReader* _tmp10_;
gboolean timestamp_changed = FALSE;
gboolean filesize_changed = FALSE;
gboolean is_new_editable = FALSE;
BackingPhotoID editable_id = {0};
BackingPhotoID _tmp11_ = {0};
GFile* file = NULL;
- PhotoFileReader* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
+ PhotoFileReader* _tmp12_;
+ GFile* _tmp13_;
DetectedPhotoInformation* detected = NULL;
BackingPhotoRow* backing = NULL;
- GFile* _tmp14_ = NULL;
+ GFile* _tmp14_;
DetectedPhotoInformation* _tmp15_ = NULL;
- BackingPhotoRow* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
- gboolean _tmp35_ = FALSE;
- PhotoFileReader* _tmp94_ = NULL;
+ BackingPhotoRow* _tmp16_;
+ gboolean _tmp17_;
+ gboolean _tmp35_;
+ PhotoFileReader* _tmp94_;
gboolean _tmp100_ = FALSE;
- gboolean _tmp101_ = FALSE;
+ gboolean _tmp101_;
gchar** alteration_list = NULL;
- gchar** _tmp112_ = NULL;
- gint alteration_list_length1 = 0;
- gint _alteration_list_size_ = 0;
- gboolean _tmp113_ = FALSE;
+ gchar** _tmp112_;
+ gint alteration_list_length1;
+ gint _alteration_list_size_;
+ gboolean _tmp113_;
gboolean _tmp121_ = FALSE;
- gboolean _tmp122_ = FALSE;
- gchar** _tmp131_ = NULL;
- gint _tmp131__length1 = 0;
+ gboolean _tmp122_;
+ gchar** _tmp131_;
+ gint _tmp131__length1;
GError * _inner_error_ = NULL;
#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -28256,30 +28234,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp2_ = only_attributes;
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_) {
-#line 28256 "Photo.c"
- PhotoFileReader* _tmp3_ = NULL;
+#line 28234 "Photo.c"
+ PhotoFileReader* _tmp3_;
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = new_reader;
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = _tmp3_ == NULL;
-#line 28262 "Photo.c"
+#line 28240 "Photo.c"
} else {
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = FALSE;
-#line 28266 "Photo.c"
+#line 28244 "Photo.c"
}
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = TRUE;
-#line 28272 "Photo.c"
+#line 28250 "Photo.c"
} else {
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp4_;
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = only_attributes;
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = !_tmp4_;
-#line 28279 "Photo.c"
+#line 28257 "Photo.c"
}
#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
@@ -28293,13 +28271,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp6_ = _tmp7_;
#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ == NULL) {
-#line 28293 "Photo.c"
- PhotoFileReader* _tmp8_ = NULL;
+#line 28271 "Photo.c"
+ PhotoFileReader* _tmp8_;
#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = old_reader;
#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp8_;
-#line 28299 "Photo.c"
+#line 28277 "Photo.c"
}
#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
@@ -28317,7 +28295,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28317 "Photo.c"
+#line 28295 "Photo.c"
}
#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
timestamp_changed = FALSE;
@@ -28359,22 +28337,22 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28359 "Photo.c"
+#line 28337 "Photo.c"
}
#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = backing_photo_id_is_invalid (&editable_id);
#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp17_) {
-#line 28365 "Photo.c"
- BackingPhotoRow* _tmp18_ = NULL;
+#line 28343 "Photo.c"
+ BackingPhotoRow* _tmp18_;
#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = backing;
#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_ != NULL) {
-#line 28371 "Photo.c"
- BackingPhotoTable* _tmp19_ = NULL;
- BackingPhotoTable* _tmp20_ = NULL;
- BackingPhotoRow* _tmp21_ = NULL;
+#line 28349 "Photo.c"
+ BackingPhotoTable* _tmp19_;
+ BackingPhotoTable* _tmp20_;
+ BackingPhotoRow* _tmp21_;
#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = backing_photo_table_get_instance ();
#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28401,27 +28379,27 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28401 "Photo.c"
+#line 28379 "Photo.c"
}
{
- PhotoRow* _tmp22_ = NULL;
+ PhotoRow* _tmp22_;
#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = self->row;
#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28409 "Photo.c"
+#line 28387 "Photo.c"
{
- PhotoTable* _tmp23_ = NULL;
- PhotoTable* _tmp24_ = NULL;
- PhotoRow* _tmp25_ = NULL;
- BackingPhotoRow* _tmp26_ = NULL;
- BackingPhotoID _tmp27_ = {0};
- BackingPhotoRow* _tmp28_ = NULL;
- BackingPhotoRow* _tmp29_ = NULL;
- BackingPhotoRow* _tmp30_ = NULL;
- BackingPhotoRow* _tmp31_ = NULL;
- BackingPhotoRow* _tmp32_ = NULL;
- Orientation _tmp33_ = 0;
+ PhotoTable* _tmp23_;
+ PhotoTable* _tmp24_;
+ PhotoRow* _tmp25_;
+ BackingPhotoRow* _tmp26_;
+ BackingPhotoID _tmp27_;
+ BackingPhotoRow* _tmp28_;
+ BackingPhotoRow* _tmp29_;
+ BackingPhotoRow* _tmp30_;
+ BackingPhotoRow* _tmp31_;
+ BackingPhotoRow* _tmp32_;
+ Orientation _tmp33_;
#line 3935 "/home/jens/Source/shotwell/src/Photo.vala"
timestamp_changed = TRUE;
#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28442,8 +28420,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_database_table_unref0 (_tmp24_);
#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28442 "Photo.c"
- goto __finally391;
+#line 28420 "Photo.c"
+ goto __finally392;
}
#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = backing;
@@ -28467,16 +28445,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp33_ = _tmp32_->original_orientation;
#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_orientation (self, _tmp33_);
-#line 28467 "Photo.c"
+#line 28445 "Photo.c"
}
- __finally391:
+ __finally392:
{
- PhotoRow* _tmp34_ = NULL;
+ PhotoRow* _tmp34_;
#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = self->row;
#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28476 "Photo.c"
+#line 28454 "Photo.c"
}
#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28494,41 +28472,41 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28494 "Photo.c"
+#line 28472 "Photo.c"
}
}
}
#line 3944 "/home/jens/Source/shotwell/src/Photo.vala"
is_new_editable = TRUE;
-#line 28500 "Photo.c"
+#line 28478 "Photo.c"
}
#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp35_ = only_attributes;
#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp35_) {
-#line 28506 "Photo.c"
- gboolean _tmp36_ = FALSE;
+#line 28484 "Photo.c"
+ gboolean _tmp36_;
GFileInfo* info = NULL;
GTimeVal timestamp = {0};
- GFileInfo* _tmp45_ = NULL;
+ GFileInfo* _tmp45_;
GTimeVal _tmp46_ = {0};
- BackingPhotoTable* _tmp47_ = NULL;
- BackingPhotoTable* _tmp48_ = NULL;
- BackingPhotoID _tmp49_ = {0};
- GTimeVal _tmp50_ = {0};
- glong _tmp51_ = 0L;
- GFileInfo* _tmp52_ = NULL;
- gint64 _tmp53_ = 0LL;
+ BackingPhotoTable* _tmp47_;
+ BackingPhotoTable* _tmp48_;
+ BackingPhotoID _tmp49_;
+ GTimeVal _tmp50_;
+ glong _tmp51_;
+ GFileInfo* _tmp52_;
+ gint64 _tmp53_;
#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = backing_photo_id_is_valid (&editable_id);
#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_assert (_tmp36_, "editable_id.is_valid()");
-#line 28523 "Photo.c"
+#line 28501 "Photo.c"
{
GFileInfo* _tmp37_ = NULL;
- GFile* _tmp38_ = NULL;
- GFileInfo* _tmp39_ = NULL;
- GFileInfo* _tmp40_ = NULL;
+ GFile* _tmp38_;
+ GFileInfo* _tmp39_;
+ GFileInfo* _tmp40_;
#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = file;
#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28537,8 +28515,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp37_ = _tmp39_;
#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28537 "Photo.c"
- goto __catch392_g_error;
+#line 28515 "Photo.c"
+ goto __catch393_g_error;
}
#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = _tmp37_;
@@ -28550,16 +28528,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
info = _tmp40_;
#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp37_);
-#line 28550 "Photo.c"
+#line 28528 "Photo.c"
}
- goto __finally392;
- __catch392_g_error:
+ goto __finally393;
+ __catch393_g_error:
{
GError* err = NULL;
- gchar* _tmp41_ = NULL;
- gchar* _tmp42_ = NULL;
- GError* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
+ gchar* _tmp41_;
+ gchar* _tmp42_;
+ GError* _tmp43_;
+ const gchar* _tmp44_;
#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28594,9 +28572,9 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28594 "Photo.c"
+#line 28572 "Photo.c"
}
- __finally392:
+ __finally393:
#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28615,7 +28593,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28615 "Photo.c"
+#line 28593 "Photo.c"
}
#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = info;
@@ -28659,30 +28637,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28659 "Photo.c"
+#line 28637 "Photo.c"
}
{
- PhotoRow* _tmp54_ = NULL;
+ PhotoRow* _tmp54_;
#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp54_ = self->row;
#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28667 "Photo.c"
+#line 28645 "Photo.c"
{
- BackingPhotoRow* _tmp55_ = NULL;
- time_t _tmp56_ = 0;
- GTimeVal _tmp57_ = {0};
- glong _tmp58_ = 0L;
- BackingPhotoRow* _tmp59_ = NULL;
- gint64 _tmp60_ = 0LL;
- GFileInfo* _tmp61_ = NULL;
- gint64 _tmp62_ = 0LL;
- BackingPhotoRow* _tmp63_ = NULL;
- GTimeVal _tmp64_ = {0};
- glong _tmp65_ = 0L;
- BackingPhotoRow* _tmp66_ = NULL;
- GFileInfo* _tmp67_ = NULL;
- gint64 _tmp68_ = 0LL;
+ BackingPhotoRow* _tmp55_;
+ time_t _tmp56_;
+ GTimeVal _tmp57_;
+ glong _tmp58_;
+ BackingPhotoRow* _tmp59_;
+ gint64 _tmp60_;
+ GFileInfo* _tmp61_;
+ gint64 _tmp62_;
+ BackingPhotoRow* _tmp63_;
+ GTimeVal _tmp64_;
+ glong _tmp65_;
+ BackingPhotoRow* _tmp66_;
+ GFileInfo* _tmp67_;
+ gint64 _tmp68_;
#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = self->priv->editable;
#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28719,16 +28697,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp68_ = g_file_info_get_size (_tmp67_);
#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp66_->filesize = _tmp68_;
-#line 28719 "Photo.c"
+#line 28697 "Photo.c"
}
- __finally393:
+ __finally394:
{
- PhotoRow* _tmp69_ = NULL;
+ PhotoRow* _tmp69_;
#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = self->row;
#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28728 "Photo.c"
+#line 28706 "Photo.c"
}
#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28748,39 +28726,39 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28748 "Photo.c"
+#line 28726 "Photo.c"
}
}
#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (info);
-#line 28753 "Photo.c"
+#line 28731 "Photo.c"
} else {
gboolean _tmp70_ = FALSE;
- gboolean _tmp71_ = FALSE;
+ gboolean _tmp71_;
#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp71_ = backing_photo_id_is_valid (&editable_id);
#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp71_) {
-#line 28761 "Photo.c"
- gboolean _tmp72_ = FALSE;
+#line 28739 "Photo.c"
+ gboolean _tmp72_;
#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp72_ = is_new_editable;
#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp70_ = !_tmp72_;
-#line 28767 "Photo.c"
+#line 28745 "Photo.c"
} else {
#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp70_ = FALSE;
-#line 28771 "Photo.c"
+#line 28749 "Photo.c"
}
#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp70_) {
-#line 28775 "Photo.c"
- BackingPhotoRow* _tmp73_ = NULL;
- BackingPhotoID _tmp74_ = {0};
- BackingPhotoTable* _tmp75_ = NULL;
- BackingPhotoTable* _tmp76_ = NULL;
- BackingPhotoRow* _tmp77_ = NULL;
+#line 28753 "Photo.c"
+ BackingPhotoRow* _tmp73_;
+ BackingPhotoID _tmp74_;
+ BackingPhotoTable* _tmp75_;
+ BackingPhotoTable* _tmp76_;
+ BackingPhotoRow* _tmp77_;
#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp73_ = backing;
#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28813,30 +28791,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28813 "Photo.c"
+#line 28791 "Photo.c"
}
{
- PhotoRow* _tmp78_ = NULL;
+ PhotoRow* _tmp78_;
#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = self->row;
#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28821 "Photo.c"
+#line 28799 "Photo.c"
{
- BackingPhotoRow* _tmp79_ = NULL;
- time_t _tmp80_ = 0;
- BackingPhotoRow* _tmp81_ = NULL;
- time_t _tmp82_ = 0;
- BackingPhotoRow* _tmp83_ = NULL;
- gint64 _tmp84_ = 0LL;
- BackingPhotoRow* _tmp85_ = NULL;
- gint64 _tmp86_ = 0LL;
- BackingPhotoRow* _tmp87_ = NULL;
- BackingPhotoRow* _tmp88_ = NULL;
- BackingPhotoRow* _tmp89_ = NULL;
- BackingPhotoRow* _tmp90_ = NULL;
- BackingPhotoRow* _tmp91_ = NULL;
- Orientation _tmp92_ = 0;
+ BackingPhotoRow* _tmp79_;
+ time_t _tmp80_;
+ BackingPhotoRow* _tmp81_;
+ time_t _tmp82_;
+ BackingPhotoRow* _tmp83_;
+ gint64 _tmp84_;
+ BackingPhotoRow* _tmp85_;
+ gint64 _tmp86_;
+ BackingPhotoRow* _tmp87_;
+ BackingPhotoRow* _tmp88_;
+ BackingPhotoRow* _tmp89_;
+ BackingPhotoRow* _tmp90_;
+ BackingPhotoRow* _tmp91_;
+ Orientation _tmp92_;
#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp79_ = self->priv->editable;
#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28879,16 +28857,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp92_ = _tmp91_->original_orientation;
#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_orientation (self, _tmp92_);
-#line 28879 "Photo.c"
+#line 28857 "Photo.c"
}
- __finally394:
+ __finally395:
{
- PhotoRow* _tmp93_ = NULL;
+ PhotoRow* _tmp93_;
#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp93_ = self->row;
#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28888 "Photo.c"
+#line 28866 "Photo.c"
}
#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28906,7 +28884,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28906 "Photo.c"
+#line 28884 "Photo.c"
}
}
}
@@ -28915,18 +28893,18 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp94_ = new_reader;
#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp94_ != NULL) {
-#line 28915 "Photo.c"
+#line 28893 "Photo.c"
{
- PhotoBackingReaders* _tmp95_ = NULL;
+ PhotoBackingReaders* _tmp95_;
#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp95_ = self->priv->readers;
#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 28922 "Photo.c"
+#line 28900 "Photo.c"
{
- PhotoBackingReaders* _tmp96_ = NULL;
- PhotoFileReader* _tmp97_ = NULL;
- PhotoFileReader* _tmp98_ = NULL;
+ PhotoBackingReaders* _tmp96_;
+ PhotoFileReader* _tmp97_;
+ PhotoFileReader* _tmp98_;
#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp96_ = self->priv->readers;
#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28937,16 +28915,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (_tmp96_->editable);
#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp96_->editable = _tmp98_;
-#line 28937 "Photo.c"
+#line 28915 "Photo.c"
}
- __finally395:
+ __finally396:
{
- PhotoBackingReaders* _tmp99_ = NULL;
+ PhotoBackingReaders* _tmp99_;
#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp99_ = self->priv->readers;
#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28946 "Photo.c"
+#line 28924 "Photo.c"
}
#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28964,7 +28942,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (old_reader);
#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 28964 "Photo.c"
+#line 28942 "Photo.c"
}
}
}
@@ -28972,37 +28950,37 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp101_ = only_attributes;
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp101_) {
-#line 28972 "Photo.c"
- PhotoFileReader* _tmp102_ = NULL;
- PhotoFileReader* _tmp103_ = NULL;
+#line 28950 "Photo.c"
+ PhotoFileReader* _tmp102_;
+ PhotoFileReader* _tmp103_;
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp102_ = reader;
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp103_ = old_reader;
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp100_ = _tmp102_ != _tmp103_;
-#line 28981 "Photo.c"
+#line 28959 "Photo.c"
} else {
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp100_ = FALSE;
-#line 28985 "Photo.c"
+#line 28963 "Photo.c"
}
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp100_) {
-#line 28989 "Photo.c"
+#line 28967 "Photo.c"
GFile* _tmp104_ = NULL;
- PhotoFileReader* _tmp105_ = NULL;
+ PhotoFileReader* _tmp105_;
GFile* _tmp108_ = NULL;
- PhotoFileReader* _tmp109_ = NULL;
+ PhotoFileReader* _tmp109_;
#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_baseline_replaced (self);
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp105_ = old_reader;
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp105_ != NULL) {
-#line 29000 "Photo.c"
- PhotoFileReader* _tmp106_ = NULL;
- GFile* _tmp107_ = NULL;
+#line 28978 "Photo.c"
+ PhotoFileReader* _tmp106_;
+ GFile* _tmp107_;
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp106_ = old_reader;
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29011,21 +28989,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_g_object_unref0 (_tmp104_);
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp104_ = _tmp107_;
-#line 29011 "Photo.c"
+#line 28989 "Photo.c"
} else {
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp104_);
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp104_ = NULL;
-#line 29017 "Photo.c"
+#line 28995 "Photo.c"
}
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp109_ = new_reader;
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp109_ != NULL) {
-#line 29023 "Photo.c"
- PhotoFileReader* _tmp110_ = NULL;
- GFile* _tmp111_ = NULL;
+#line 29001 "Photo.c"
+ PhotoFileReader* _tmp110_;
+ GFile* _tmp111_;
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp110_ = new_reader;
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29034,13 +29012,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_g_object_unref0 (_tmp108_);
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp108_ = _tmp111_;
-#line 29034 "Photo.c"
+#line 29012 "Photo.c"
} else {
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp108_);
#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp108_ = NULL;
-#line 29040 "Photo.c"
+#line 29018 "Photo.c"
}
#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
@@ -29048,7 +29026,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_g_object_unref0 (_tmp108_);
#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp104_);
-#line 29048 "Photo.c"
+#line 29026 "Photo.c"
}
#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp112_ = g_new0 (gchar*, 0 + 1);
@@ -29062,14 +29040,14 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp113_ = timestamp_changed;
#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp113_) {
-#line 29062 "Photo.c"
- gchar** _tmp114_ = NULL;
- gint _tmp114__length1 = 0;
- gchar* _tmp115_ = NULL;
- gchar** _tmp116_ = NULL;
- gint _tmp116__length1 = 0;
- gchar* _tmp117_ = NULL;
- gboolean _tmp118_ = FALSE;
+#line 29040 "Photo.c"
+ gchar** _tmp114_;
+ gint _tmp114__length1;
+ gchar* _tmp115_;
+ gchar** _tmp116_;
+ gint _tmp116__length1;
+ gchar* _tmp117_;
+ gboolean _tmp118_;
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp114_ = alteration_list;
#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29090,10 +29068,10 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp118_ = photo_is_editable_source (self);
#line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp118_) {
-#line 29090 "Photo.c"
- gchar** _tmp119_ = NULL;
- gint _tmp119__length1 = 0;
- gchar* _tmp120_ = NULL;
+#line 29068 "Photo.c"
+ gchar** _tmp119_;
+ gint _tmp119__length1;
+ gchar* _tmp120_;
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp119_ = alteration_list;
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29102,7 +29080,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp120_ = g_strdup ("metadata:source-timestamp");
#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
-#line 29102 "Photo.c"
+#line 29080 "Photo.c"
}
}
#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29111,25 +29089,25 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
if (_tmp122_) {
#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp121_ = TRUE;
-#line 29111 "Photo.c"
+#line 29089 "Photo.c"
} else {
- PhotoFileReader* _tmp123_ = NULL;
+ PhotoFileReader* _tmp123_;
#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp123_ = new_reader;
#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp121_ = _tmp123_ != NULL;
-#line 29118 "Photo.c"
+#line 29096 "Photo.c"
}
#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp121_) {
-#line 29122 "Photo.c"
- gchar** _tmp124_ = NULL;
- gint _tmp124__length1 = 0;
- gchar* _tmp125_ = NULL;
- gchar** _tmp126_ = NULL;
- gint _tmp126__length1 = 0;
- gchar* _tmp127_ = NULL;
- gboolean _tmp128_ = FALSE;
+#line 29100 "Photo.c"
+ gchar** _tmp124_;
+ gint _tmp124__length1;
+ gchar* _tmp125_;
+ gchar** _tmp126_;
+ gint _tmp126__length1;
+ gchar* _tmp127_;
+ gboolean _tmp128_;
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp124_ = alteration_list;
#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29150,10 +29128,10 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp128_ = photo_is_editable_source (self);
#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp128_) {
-#line 29150 "Photo.c"
- gchar** _tmp129_ = NULL;
- gint _tmp129__length1 = 0;
- gchar* _tmp130_ = NULL;
+#line 29128 "Photo.c"
+ gchar** _tmp129_;
+ gint _tmp129__length1;
+ gchar* _tmp130_;
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp129_ = alteration_list;
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29162,7 +29140,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp130_ = g_strdup ("image:source");
#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
-#line 29162 "Photo.c"
+#line 29140 "Photo.c"
}
}
#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29171,11 +29149,11 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_tmp131__length1 = alteration_list_length1;
#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp131__length1 > 0) {
-#line 29171 "Photo.c"
- gchar** _tmp132_ = NULL;
- gint _tmp132__length1 = 0;
- Alteration* _tmp133_ = NULL;
- Alteration* _tmp134_ = NULL;
+#line 29149 "Photo.c"
+ gchar** _tmp132_;
+ gint _tmp132__length1;
+ Alteration* _tmp133_;
+ Alteration* _tmp134_;
#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp132_ = alteration_list;
#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29188,7 +29166,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_);
#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp134_);
-#line 29188 "Photo.c"
+#line 29166 "Photo.c"
}
#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
@@ -29202,21 +29180,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
_photo_file_adapter_unref0 (reader);
#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (old_reader);
-#line 29202 "Photo.c"
+#line 29180 "Photo.c"
}
static void photo_detach_editable (Photo* self, gboolean delete_editable, gboolean remove_transformations, gboolean notify) {
gboolean has_editable = FALSE;
GFile* editable_file = NULL;
- gboolean _tmp8_ = FALSE;
- gboolean _tmp28_ = FALSE;
- gboolean _tmp29_ = FALSE;
+ gboolean _tmp8_;
+ gboolean _tmp28_;
+ gboolean _tmp29_;
gboolean _tmp31_ = FALSE;
- gboolean _tmp32_ = FALSE;
+ gboolean _tmp32_;
gboolean _tmp42_ = FALSE;
gboolean _tmp43_ = FALSE;
- gboolean _tmp44_ = FALSE;
+ gboolean _tmp44_;
GError * _inner_error_ = NULL;
#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -29226,28 +29204,28 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
has_editable = FALSE;
#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
editable_file = NULL;
-#line 29226 "Photo.c"
+#line 29204 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29233 "Photo.c"
+#line 29211 "Photo.c"
{
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = _tmp1_->editable;
#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 29243 "Photo.c"
- PhotoBackingReaders* _tmp3_ = NULL;
- PhotoFileReader* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
- PhotoBackingReaders* _tmp6_ = NULL;
+#line 29221 "Photo.c"
+ PhotoBackingReaders* _tmp3_;
+ PhotoFileReader* _tmp4_;
+ GFile* _tmp5_;
+ PhotoBackingReaders* _tmp6_;
#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->readers;
#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29266,17 +29244,17 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
_tmp6_->editable = NULL;
#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
has_editable = TRUE;
-#line 29266 "Photo.c"
+#line 29244 "Photo.c"
}
}
- __finally396:
+ __finally397:
{
- PhotoBackingReaders* _tmp7_ = NULL;
+ PhotoBackingReaders* _tmp7_;
#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = self->priv->readers;
#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29276 "Photo.c"
+#line 29254 "Photo.c"
}
#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29288,33 +29266,33 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_clear_error (&_inner_error_);
#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29288 "Photo.c"
+#line 29266 "Photo.c"
}
}
#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = has_editable;
#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
-#line 29295 "Photo.c"
+#line 29273 "Photo.c"
BackingPhotoID editable_id = {0};
#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID);
-#line 29299 "Photo.c"
+#line 29277 "Photo.c"
{
{
- PhotoRow* _tmp9_ = NULL;
+ PhotoRow* _tmp9_;
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = self->row;
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29307 "Photo.c"
+#line 29285 "Photo.c"
{
- PhotoRow* _tmp10_ = NULL;
- BackingPhotoID _tmp11_ = {0};
- gboolean _tmp12_ = FALSE;
- PhotoRow* _tmp16_ = NULL;
- BackingPhotoRow* _tmp17_ = NULL;
- BackingPhotoRow* _tmp18_ = NULL;
+ PhotoRow* _tmp10_;
+ BackingPhotoID _tmp11_;
+ gboolean _tmp12_;
+ PhotoRow* _tmp16_;
+ BackingPhotoRow* _tmp17_;
+ BackingPhotoRow* _tmp18_;
#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->row;
#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29325,10 +29303,10 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
_tmp12_ = backing_photo_id_is_valid (&editable_id);
#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 29325 "Photo.c"
- PhotoTable* _tmp13_ = NULL;
- PhotoTable* _tmp14_ = NULL;
- PhotoRow* _tmp15_ = NULL;
+#line 29303 "Photo.c"
+ PhotoTable* _tmp13_;
+ PhotoTable* _tmp14_;
+ PhotoRow* _tmp15_;
#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = photo_table_get_instance ();
#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29341,8 +29319,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
_database_table_unref0 (_tmp14_);
#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29341 "Photo.c"
- goto __finally398;
+#line 29319 "Photo.c"
+ goto __finally399;
}
}
#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29355,23 +29333,23 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
_backing_photo_row_unref0 (self->backing_photo_row);
#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_photo_row = _tmp18_;
-#line 29355 "Photo.c"
+#line 29333 "Photo.c"
}
- __finally398:
+ __finally399:
{
- PhotoRow* _tmp19_ = NULL;
+ PhotoRow* _tmp19_;
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = self->row;
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29364 "Photo.c"
+#line 29342 "Photo.c"
}
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29370 "Photo.c"
- goto __catch397_database_error;
+#line 29348 "Photo.c"
+ goto __catch398_database_error;
}
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (editable_file);
@@ -29381,16 +29359,16 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_clear_error (&_inner_error_);
#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29381 "Photo.c"
+#line 29359 "Photo.c"
}
}
}
- goto __finally397;
- __catch397_database_error:
+ goto __finally398;
+ __catch398_database_error:
{
GError* err = NULL;
- GError* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
+ GError* _tmp20_;
+ const gchar* _tmp21_;
#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29403,9 +29381,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_warning ("Photo.vala:4049: Unable to remove editable from PhotoTable: %s", _tmp21_);
#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 29403 "Photo.c"
+#line 29381 "Photo.c"
}
- __finally397:
+ __finally398:
#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29416,18 +29394,18 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_clear_error (&_inner_error_);
#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29416 "Photo.c"
+#line 29394 "Photo.c"
}
{
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp22_;
#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = backing_photo_id_is_valid (&editable_id);
#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_) {
-#line 29424 "Photo.c"
- BackingPhotoTable* _tmp23_ = NULL;
- BackingPhotoTable* _tmp24_ = NULL;
- BackingPhotoID _tmp25_ = {0};
+#line 29402 "Photo.c"
+ BackingPhotoTable* _tmp23_;
+ BackingPhotoTable* _tmp24_;
+ BackingPhotoID _tmp25_;
#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = backing_photo_table_get_instance ();
#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29442,8 +29420,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29442 "Photo.c"
- goto __catch399_database_error;
+#line 29420 "Photo.c"
+ goto __catch400_database_error;
}
#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (editable_file);
@@ -29453,16 +29431,16 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_clear_error (&_inner_error_);
#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29453 "Photo.c"
+#line 29431 "Photo.c"
}
}
}
- goto __finally399;
- __catch399_database_error:
+ goto __finally400;
+ __catch400_database_error:
{
GError* err = NULL;
- GError* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
+ GError* _tmp26_;
+ const gchar* _tmp27_;
#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29475,9 +29453,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_warning ("Photo.vala:4056: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 29475 "Photo.c"
+#line 29453 "Photo.c"
}
- __finally399:
+ __finally400:
#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29488,7 +29466,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_clear_error (&_inner_error_);
#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29488 "Photo.c"
+#line 29466 "Photo.c"
}
}
#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29497,64 +29475,64 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
if (_tmp28_) {
#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
photo_internal_remove_all_transformations (self, FALSE);
-#line 29497 "Photo.c"
+#line 29475 "Photo.c"
}
#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = has_editable;
#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp29_) {
-#line 29503 "Photo.c"
- GFile* _tmp30_ = NULL;
+#line 29481 "Photo.c"
+ GFile* _tmp30_;
#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_baseline_replaced (self);
#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = editable_file;
#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29511 "Photo.c"
+#line 29489 "Photo.c"
}
#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = delete_editable;
#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp32_) {
-#line 29517 "Photo.c"
- GFile* _tmp33_ = NULL;
+#line 29495 "Photo.c"
+ GFile* _tmp33_;
#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp33_ = editable_file;
#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = _tmp33_ != NULL;
-#line 29523 "Photo.c"
+#line 29501 "Photo.c"
} else {
#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = FALSE;
-#line 29527 "Photo.c"
+#line 29505 "Photo.c"
}
#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp31_) {
-#line 29531 "Photo.c"
+#line 29509 "Photo.c"
{
- GFile* _tmp34_ = NULL;
+ GFile* _tmp34_;
#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = editable_file;
#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
g_file_trash (_tmp34_, NULL, &_inner_error_);
#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29540 "Photo.c"
- goto __catch400_g_error;
+#line 29518 "Photo.c"
+ goto __catch401_g_error;
}
}
- goto __finally400;
- __catch400_g_error:
+ goto __finally401;
+ __catch401_g_error:
{
GError* err = NULL;
- GFile* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- GError* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
+ GFile* _tmp35_;
+ gchar* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ GError* _tmp40_;
+ const gchar* _tmp41_;
#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29581,9 +29559,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
_g_free0 (_tmp37_);
#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 29581 "Photo.c"
+#line 29559 "Photo.c"
}
- __finally400:
+ __finally401:
#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29594,7 +29572,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
g_clear_error (&_inner_error_);
#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29594 "Photo.c"
+#line 29572 "Photo.c"
}
}
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29603,34 +29581,34 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
if (_tmp44_) {
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = TRUE;
-#line 29603 "Photo.c"
+#line 29581 "Photo.c"
} else {
- gboolean _tmp45_ = FALSE;
+ gboolean _tmp45_;
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = remove_transformations;
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = _tmp45_;
-#line 29610 "Photo.c"
+#line 29588 "Photo.c"
}
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp43_) {
-#line 29614 "Photo.c"
- gboolean _tmp46_ = FALSE;
+#line 29592 "Photo.c"
+ gboolean _tmp46_;
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = notify;
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = _tmp46_;
-#line 29620 "Photo.c"
+#line 29598 "Photo.c"
} else {
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = FALSE;
-#line 29624 "Photo.c"
+#line 29602 "Photo.c"
}
#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp42_) {
-#line 29628 "Photo.c"
- Alteration* _tmp47_ = NULL;
- Alteration* _tmp48_ = NULL;
+#line 29606 "Photo.c"
+ Alteration* _tmp47_;
+ Alteration* _tmp48_;
#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = alteration_new ("image", "revert");
#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29639,42 +29617,42 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_);
#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp48_);
-#line 29639 "Photo.c"
+#line 29617 "Photo.c"
}
#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (editable_file);
-#line 29643 "Photo.c"
+#line 29621 "Photo.c"
}
static void _photo_on_reimport_editable_one_shot_callback (gpointer self) {
#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
photo_on_reimport_editable ((Photo*) self);
-#line 29650 "Photo.c"
+#line 29628 "Photo.c"
}
static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) {
#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
photo_on_update_editable_attributes ((Photo*) self);
-#line 29657 "Photo.c"
+#line 29635 "Photo.c"
}
static void _photo_on_remove_editable_one_shot_callback (gpointer self) {
#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
photo_on_remove_editable ((Photo*) self);
-#line 29664 "Photo.c"
+#line 29642 "Photo.c"
}
static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* other_file, GFileMonitorEvent event) {
- GFileMonitorEvent _tmp12_ = 0;
+ GFileMonitorEvent _tmp12_;
GEnumValue* _tmp13_;
- GFile* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- GFileMonitorEvent _tmp17_ = 0;
+ GFile* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ GFileMonitorEvent _tmp17_;
GError * _inner_error_ = NULL;
#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -29682,24 +29660,24 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
g_return_if_fail (G_IS_FILE (file));
#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 29682 "Photo.c"
+#line 29660 "Photo.c"
{
- PhotoBackingReaders* _tmp0_ = NULL;
+ PhotoBackingReaders* _tmp0_;
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->readers;
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29689 "Photo.c"
- {
- PhotoBackingReaders* _tmp1_ = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- PhotoBackingReaders* _tmp4_ = NULL;
- PhotoFileReader* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
- GFile* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
+#line 29667 "Photo.c"
+ {
+ PhotoBackingReaders* _tmp1_;
+ PhotoFileReader* _tmp2_;
+ GFile* _tmp3_;
+ PhotoBackingReaders* _tmp4_;
+ PhotoFileReader* _tmp5_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
+ gboolean _tmp8_;
+ gboolean _tmp9_;
#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->readers;
#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29724,28 +29702,28 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
_g_object_unref0 (_tmp7_);
#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp9_) {
-#line 29724 "Photo.c"
+#line 29702 "Photo.c"
{
- PhotoBackingReaders* _tmp10_ = NULL;
+ PhotoBackingReaders* _tmp10_;
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->priv->readers;
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29731 "Photo.c"
+#line 29709 "Photo.c"
}
#line 4090 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29735 "Photo.c"
+#line 29713 "Photo.c"
}
}
- __finally401:
+ __finally402:
{
- PhotoBackingReaders* _tmp11_ = NULL;
+ PhotoBackingReaders* _tmp11_;
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = self->priv->readers;
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29745 "Photo.c"
+#line 29723 "Photo.c"
}
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29755,7 +29733,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
g_clear_error (&_inner_error_);
#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29755 "Photo.c"
+#line 29733 "Photo.c"
}
}
#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29780,23 +29758,23 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
case G_FILE_MONITOR_EVENT_CHANGED:
#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
case G_FILE_MONITOR_EVENT_CREATED:
-#line 29780 "Photo.c"
+#line 29758 "Photo.c"
{
- OneShotScheduler* _tmp18_ = NULL;
- OneShotScheduler* _tmp20_ = NULL;
+ OneShotScheduler* _tmp18_;
+ OneShotScheduler* _tmp20_;
#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = self->priv->reimport_editable_scheduler;
#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_ == NULL) {
-#line 29788 "Photo.c"
- OneShotScheduler* _tmp19_ = NULL;
+#line 29766 "Photo.c"
+ OneShotScheduler* _tmp19_;
#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self);
#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
_one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler);
#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->reimport_editable_scheduler = _tmp19_;
-#line 29796 "Photo.c"
+#line 29774 "Photo.c"
}
#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = self->priv->reimport_editable_scheduler;
@@ -29804,27 +29782,27 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE);
#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 29804 "Photo.c"
+#line 29782 "Photo.c"
}
#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29808 "Photo.c"
+#line 29786 "Photo.c"
{
- OneShotScheduler* _tmp21_ = NULL;
- OneShotScheduler* _tmp23_ = NULL;
+ OneShotScheduler* _tmp21_;
+ OneShotScheduler* _tmp23_;
#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = self->priv->update_editable_attributes_scheduler;
#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_ == NULL) {
-#line 29816 "Photo.c"
- OneShotScheduler* _tmp22_ = NULL;
+#line 29794 "Photo.c"
+ OneShotScheduler* _tmp22_;
#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self);
#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
_one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler);
#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->update_editable_attributes_scheduler = _tmp22_;
-#line 29824 "Photo.c"
+#line 29802 "Photo.c"
}
#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = self->priv->update_editable_attributes_scheduler;
@@ -29832,27 +29810,27 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE);
#line 4114 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 29832 "Photo.c"
+#line 29810 "Photo.c"
}
#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
case G_FILE_MONITOR_EVENT_DELETED:
-#line 29836 "Photo.c"
+#line 29814 "Photo.c"
{
- OneShotScheduler* _tmp24_ = NULL;
- OneShotScheduler* _tmp26_ = NULL;
+ OneShotScheduler* _tmp24_;
+ OneShotScheduler* _tmp26_;
#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = self->priv->remove_editable_scheduler;
#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp24_ == NULL) {
-#line 29844 "Photo.c"
- OneShotScheduler* _tmp25_ = NULL;
+#line 29822 "Photo.c"
+ OneShotScheduler* _tmp25_;
#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self);
#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
_one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler);
#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->remove_editable_scheduler = _tmp25_;
-#line 29852 "Photo.c"
+#line 29830 "Photo.c"
}
#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = self->priv->remove_editable_scheduler;
@@ -29860,27 +29838,27 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE);
#line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 29860 "Photo.c"
+#line 29838 "Photo.c"
}
default:
#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29865 "Photo.c"
+#line 29843 "Photo.c"
{
#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 29869 "Photo.c"
+#line 29847 "Photo.c"
}
}
#line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
photo_discard_prefetched (self);
-#line 29874 "Photo.c"
+#line 29852 "Photo.c"
}
static void photo_on_reimport_editable (Photo* self) {
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
GError * _inner_error_ = NULL;
#line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -29894,24 +29872,24 @@ static void photo_on_reimport_editable (Photo* self) {
g_debug ("Photo.vala:4140: Reimporting editable for %s", _tmp1_);
#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp1_);
-#line 29894 "Photo.c"
+#line 29872 "Photo.c"
{
#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_editable (self, &_inner_error_);
#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29900 "Photo.c"
- goto __catch402_g_error;
+#line 29878 "Photo.c"
+ goto __catch403_g_error;
}
}
- goto __finally402;
- __catch402_g_error:
+ goto __finally403;
+ __catch403_g_error:
{
GError* err = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ GError* _tmp4_;
+ const gchar* _tmp5_;
#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29931,9 +29909,9 @@ static void photo_on_reimport_editable (Photo* self) {
_g_free0 (_tmp3_);
#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 29930 "Photo.c"
+#line 29908 "Photo.c"
}
- __finally402:
+ __finally403:
#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29942,14 +29920,14 @@ static void photo_on_reimport_editable (Photo* self) {
g_clear_error (&_inner_error_);
#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29941 "Photo.c"
+#line 29919 "Photo.c"
}
}
static void photo_on_update_editable_attributes (Photo* self) {
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
GError * _inner_error_ = NULL;
#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -29961,22 +29939,22 @@ static void photo_on_update_editable_attributes (Photo* self) {
g_debug ("Photo.vala:4150: Updating editable attributes for %s", _tmp1_);
#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp1_);
-#line 29960 "Photo.c"
+#line 29938 "Photo.c"
{
#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
photo_update_editable_attributes (self, &_inner_error_);
#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29966 "Photo.c"
- goto __catch403_g_error;
+#line 29944 "Photo.c"
+ goto __catch404_g_error;
}
}
- goto __finally403;
- __catch403_g_error:
+ goto __finally404;
+ __catch404_g_error:
{
GError* err = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GError* _tmp2_;
+ const gchar* _tmp3_;
#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29989,9 +29967,9 @@ static void photo_on_update_editable_attributes (Photo* self) {
g_warning ("Photo.vala:4154: Unable to update editable attributes: %s", _tmp3_);
#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 29988 "Photo.c"
+#line 29966 "Photo.c"
}
- __finally403:
+ __finally404:
#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30000,22 +29978,22 @@ static void photo_on_update_editable_attributes (Photo* self) {
g_clear_error (&_inner_error_);
#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 29999 "Photo.c"
+#line 29977 "Photo.c"
}
}
static void photo_on_remove_editable (Photo* self) {
PhotoFileReader* reader = NULL;
- PhotoFileReader* _tmp0_ = NULL;
- PhotoFileReader* _tmp1_ = NULL;
+ PhotoFileReader* _tmp0_;
+ PhotoFileReader* _tmp1_;
GFile* file = NULL;
- PhotoFileReader* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- GFile* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ PhotoFileReader* _tmp2_;
+ GFile* _tmp3_;
+ GFile* _tmp4_;
+ gboolean _tmp5_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30030,7 +30008,7 @@ static void photo_on_remove_editable (Photo* self) {
_photo_file_adapter_unref0 (reader);
#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 30029 "Photo.c"
+#line 30007 "Photo.c"
}
#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = reader;
@@ -30044,9 +30022,9 @@ static void photo_on_remove_editable (Photo* self) {
_tmp5_ = g_file_query_exists (_tmp4_, NULL);
#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 30043 "Photo.c"
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+#line 30021 "Photo.c"
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30061,7 +30039,7 @@ static void photo_on_remove_editable (Photo* self) {
_photo_file_adapter_unref0 (reader);
#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 30060 "Photo.c"
+#line 30038 "Photo.c"
}
#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -30077,7 +30055,7 @@ static void photo_on_remove_editable (Photo* self) {
_g_object_unref0 (file);
#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (reader);
-#line 30076 "Photo.c"
+#line 30054 "Photo.c"
}
@@ -30085,8 +30063,8 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
Dimensions dim = {0};
Dimensions _tmp0_ = {0};
Orientation orientation = 0;
- Orientation _tmp1_ = 0;
- Dimensions _tmp2_ = {0};
+ Orientation _tmp1_;
+ Dimensions _tmp2_;
Dimensions _tmp3_ = {0};
#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
@@ -30106,12 +30084,12 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
*result = _tmp3_;
#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 30105 "Photo.c"
+#line 30083 "Photo.c"
}
void photo_get_master_dimensions (Photo* self, Dimensions* result) {
- Orientation _tmp0_ = 0;
+ Orientation _tmp0_;
Dimensions _tmp1_ = {0};
Dimensions _tmp2_ = {0};
#line 4187 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30126,7 +30104,7 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
*result = _tmp2_;
#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 30125 "Photo.c"
+#line 30103 "Photo.c"
}
@@ -30135,13 +30113,13 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
gboolean result = FALSE;
Box raw = {0};
Box _tmp0_ = {0};
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
Dimensions dim = {0};
Dimensions _tmp2_ = {0};
Orientation orientation = 0;
- Orientation _tmp3_ = 0;
- PhotoException _tmp4_ = 0;
- gboolean _tmp5_ = FALSE;
+ Orientation _tmp3_;
+ PhotoException _tmp4_;
+ gboolean _tmp5_;
#line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30158,11 +30136,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
if (crop) {
#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
*crop = _vala_crop;
-#line 30157 "Photo.c"
+#line 30135 "Photo.c"
}
#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 30161 "Photo.c"
+#line 30139 "Photo.c"
}
#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_);
@@ -30178,10 +30156,10 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
_tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION);
#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 30177 "Photo.c"
- Orientation _tmp6_ = 0;
- Dimensions _tmp7_ = {0};
- Box _tmp8_ = {0};
+#line 30155 "Photo.c"
+ Orientation _tmp6_;
+ Dimensions _tmp7_;
+ Box _tmp8_;
Box _tmp9_ = {0};
#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = orientation;
@@ -30193,14 +30171,14 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_);
#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_crop = _tmp9_;
-#line 30192 "Photo.c"
+#line 30170 "Photo.c"
} else {
- Box _tmp10_ = {0};
+ Box _tmp10_;
#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = raw;
#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_crop = _tmp10_;
-#line 30199 "Photo.c"
+#line 30177 "Photo.c"
}
#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
@@ -30208,11 +30186,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
if (crop) {
#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
*crop = _vala_crop;
-#line 30207 "Photo.c"
+#line 30185 "Photo.c"
}
#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 30211 "Photo.c"
+#line 30189 "Photo.c"
}
@@ -30220,36 +30198,36 @@ void photo_set_crop (Photo* self, Box* crop) {
Dimensions dim = {0};
Dimensions _tmp0_ = {0};
Orientation orientation = 0;
- Orientation _tmp1_ = 0;
+ Orientation _tmp1_;
Box derotated = {0};
- Dimensions _tmp2_ = {0};
- Box _tmp3_ = {0};
+ Dimensions _tmp2_;
+ Box _tmp3_;
Box _tmp4_ = {0};
- Box _tmp5_ = {0};
- gint _tmp6_ = 0;
- Dimensions _tmp7_ = {0};
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- Box _tmp10_ = {0};
- gint _tmp11_ = 0;
- Box _tmp12_ = {0};
- gint _tmp13_ = 0;
- Dimensions _tmp14_ = {0};
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- Box _tmp17_ = {0};
- gint _tmp18_ = 0;
- Dimensions _tmp19_ = {0};
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
- Box _tmp22_ = {0};
- gint _tmp23_ = 0;
- Box _tmp24_ = {0};
- gint _tmp25_ = 0;
- Dimensions _tmp26_ = {0};
- gint _tmp27_ = 0;
- gint _tmp28_ = 0;
- Box _tmp29_ = {0};
+ Box _tmp5_;
+ gint _tmp6_;
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ Box _tmp10_;
+ gint _tmp11_;
+ Box _tmp12_;
+ gint _tmp13_;
+ Dimensions _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ Box _tmp17_;
+ gint _tmp18_;
+ Dimensions _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ Box _tmp22_;
+ gint _tmp23_;
+ Box _tmp24_;
+ gint _tmp25_;
+ Dimensions _tmp26_;
+ gint _tmp27_;
+ gint _tmp28_;
+ Box _tmp29_;
#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30330,7 +30308,7 @@ void photo_set_crop (Photo* self, Box* crop) {
_tmp29_ = derotated;
#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_raw_crop (self, &_tmp29_);
-#line 30329 "Photo.c"
+#line 30307 "Photo.c"
}
@@ -30338,7 +30316,7 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
gdouble _vala_theta = 0.0;
gboolean result = FALSE;
gdouble _tmp0_ = 0.0;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30353,11 +30331,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
if (theta) {
#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
*theta = _vala_theta;
-#line 30352 "Photo.c"
+#line 30330 "Photo.c"
}
#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 30356 "Photo.c"
+#line 30334 "Photo.c"
}
#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
result = TRUE;
@@ -30365,80 +30343,80 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
if (theta) {
#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
*theta = _vala_theta;
-#line 30364 "Photo.c"
+#line 30342 "Photo.c"
}
#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 30368 "Photo.c"
+#line 30346 "Photo.c"
}
void photo_set_straighten (Photo* self, gdouble theta) {
- gdouble _tmp0_ = 0.0;
+ gdouble _tmp0_;
#line 4234 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = theta;
#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_raw_straighten (self, _tmp0_);
-#line 30380 "Photo.c"
+#line 30358 "Photo.c"
}
static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst) {
GdkPixbuf* result = NULL;
gdouble r = 0.0;
- EditingToolsRedeyeInstance _tmp0_ = {0};
- gint _tmp1_ = 0;
+ EditingToolsRedeyeInstance _tmp0_;
+ gint _tmp1_;
gint* x_insets_first_quadrant = NULL;
- EditingToolsRedeyeInstance _tmp2_ = {0};
- gint _tmp3_ = 0;
- gint* _tmp4_ = NULL;
- gint x_insets_first_quadrant_length1 = 0;
- gint _x_insets_first_quadrant_size_ = 0;
+ EditingToolsRedeyeInstance _tmp2_;
+ gint _tmp3_;
+ gint* _tmp4_;
+ gint x_insets_first_quadrant_length1;
+ gint _x_insets_first_quadrant_size_;
gint i = 0;
gint x_bounds_min = 0;
- EditingToolsRedeyeInstance _tmp22_ = {0};
- GdkPoint _tmp23_ = {0};
- gint _tmp24_ = 0;
- EditingToolsRedeyeInstance _tmp25_ = {0};
- gint _tmp26_ = 0;
+ EditingToolsRedeyeInstance _tmp22_;
+ GdkPoint _tmp23_;
+ gint _tmp24_;
+ EditingToolsRedeyeInstance _tmp25_;
+ gint _tmp26_;
gint x_bounds_max = 0;
- EditingToolsRedeyeInstance _tmp27_ = {0};
- GdkPoint _tmp28_ = {0};
- gint _tmp29_ = 0;
- EditingToolsRedeyeInstance _tmp30_ = {0};
- gint _tmp31_ = 0;
+ EditingToolsRedeyeInstance _tmp27_;
+ GdkPoint _tmp28_;
+ gint _tmp29_;
+ EditingToolsRedeyeInstance _tmp30_;
+ gint _tmp31_;
gint ymin = 0;
- EditingToolsRedeyeInstance _tmp32_ = {0};
- GdkPoint _tmp33_ = {0};
- gint _tmp34_ = 0;
- EditingToolsRedeyeInstance _tmp35_ = {0};
- gint _tmp36_ = 0;
+ EditingToolsRedeyeInstance _tmp32_;
+ GdkPoint _tmp33_;
+ gint _tmp34_;
+ EditingToolsRedeyeInstance _tmp35_;
+ gint _tmp36_;
gint _tmp37_ = 0;
- gint _tmp38_ = 0;
+ gint _tmp38_;
gint ymax = 0;
- EditingToolsRedeyeInstance _tmp40_ = {0};
- GdkPoint _tmp41_ = {0};
- gint _tmp42_ = 0;
+ EditingToolsRedeyeInstance _tmp40_;
+ GdkPoint _tmp41_;
+ gint _tmp42_;
gint _tmp43_ = 0;
- gint _tmp44_ = 0;
- GdkPixbuf* _tmp45_ = NULL;
- gint _tmp46_ = 0;
- gint _tmp47_ = 0;
+ gint _tmp44_;
+ GdkPixbuf* _tmp45_;
+ gint _tmp46_;
+ gint _tmp47_;
gint inset_index = 0;
- EditingToolsRedeyeInstance _tmp88_ = {0};
- GdkPoint _tmp89_ = {0};
- gint _tmp90_ = 0;
- EditingToolsRedeyeInstance _tmp91_ = {0};
- GdkPoint _tmp92_ = {0};
- gint _tmp93_ = 0;
- EditingToolsRedeyeInstance _tmp94_ = {0};
- gint _tmp95_ = 0;
- gint* _tmp96_ = NULL;
- gint _tmp96__length1 = 0;
- GdkPixbuf* _tmp133_ = NULL;
- GdkPixbuf* _tmp134_ = NULL;
+ EditingToolsRedeyeInstance _tmp88_;
+ GdkPoint _tmp89_;
+ gint _tmp90_;
+ EditingToolsRedeyeInstance _tmp91_;
+ GdkPoint _tmp92_;
+ gint _tmp93_;
+ EditingToolsRedeyeInstance _tmp94_;
+ gint _tmp95_;
+ gint* _tmp96_;
+ gint _tmp96__length1;
+ GdkPixbuf* _tmp133_;
+ GdkPixbuf* _tmp134_;
#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30465,48 +30443,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
i = 0;
-#line 30464 "Photo.c"
+#line 30442 "Photo.c"
{
gdouble y = 0.0;
- gdouble _tmp5_ = 0.0;
+ gdouble _tmp5_;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = r;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
y = _tmp5_;
-#line 30472 "Photo.c"
+#line 30450 "Photo.c"
{
gboolean _tmp6_ = FALSE;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = TRUE;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 30479 "Photo.c"
- gdouble _tmp8_ = 0.0;
+#line 30457 "Photo.c"
+ gdouble _tmp8_;
gdouble theta = 0.0;
- gdouble _tmp9_ = 0.0;
- gdouble _tmp10_ = 0.0;
- gdouble _tmp11_ = 0.0;
+ gdouble _tmp9_;
+ gdouble _tmp10_;
+ gdouble _tmp11_;
gint x = 0;
- gdouble _tmp12_ = 0.0;
- gdouble _tmp13_ = 0.0;
- gdouble _tmp14_ = 0.0;
- gint* _tmp15_ = NULL;
- gint _tmp15__length1 = 0;
- gint _tmp16_ = 0;
- EditingToolsRedeyeInstance _tmp17_ = {0};
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+ gdouble _tmp12_;
+ gdouble _tmp13_;
+ gdouble _tmp14_;
+ gint* _tmp15_;
+ gint _tmp15__length1;
+ gint _tmp16_;
+ EditingToolsRedeyeInstance _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp6_) {
-#line 30499 "Photo.c"
- gdouble _tmp7_ = 0.0;
+#line 30477 "Photo.c"
+ gdouble _tmp7_;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = y;
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
y = _tmp7_ - 1.0;
-#line 30505 "Photo.c"
+#line 30483 "Photo.c"
}
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = FALSE;
@@ -30516,7 +30494,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (!(_tmp8_ >= 0.0)) {
#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 30515 "Photo.c"
+#line 30493 "Photo.c"
}
#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = y;
@@ -30554,7 +30532,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp21_ = i;
#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
i = _tmp21_ + 1;
-#line 30553 "Photo.c"
+#line 30531 "Photo.c"
}
}
}
@@ -30600,14 +30578,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (_tmp38_ < 0) {
#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = 0;
-#line 30599 "Photo.c"
+#line 30577 "Photo.c"
} else {
- gint _tmp39_ = 0;
+ gint _tmp39_;
#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = ymin;
#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp37_ = _tmp39_;
-#line 30606 "Photo.c"
+#line 30584 "Photo.c"
}
#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
ymin = _tmp37_;
@@ -30629,10 +30607,10 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp47_ = _tmp46_;
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp44_ > (_tmp47_ - 1)) {
-#line 30628 "Photo.c"
- GdkPixbuf* _tmp48_ = NULL;
- gint _tmp49_ = 0;
- gint _tmp50_ = 0;
+#line 30606 "Photo.c"
+ GdkPixbuf* _tmp48_;
+ gint _tmp49_;
+ gint _tmp50_;
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp48_ = pixbuf;
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30641,66 +30619,66 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp50_ = _tmp49_;
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = _tmp50_ - 1;
-#line 30640 "Photo.c"
+#line 30618 "Photo.c"
} else {
- gint _tmp51_ = 0;
+ gint _tmp51_;
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp51_ = ymax;
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = _tmp51_;
-#line 30647 "Photo.c"
+#line 30625 "Photo.c"
}
#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
ymax = _tmp43_;
#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
inset_index = 0;
-#line 30653 "Photo.c"
+#line 30631 "Photo.c"
{
gint y_it = 0;
- gint _tmp52_ = 0;
+ gint _tmp52_;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp52_ = ymin;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
y_it = _tmp52_;
-#line 30661 "Photo.c"
+#line 30639 "Photo.c"
{
gboolean _tmp53_ = FALSE;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp53_ = TRUE;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 30668 "Photo.c"
- gint _tmp55_ = 0;
- gint _tmp56_ = 0;
+#line 30646 "Photo.c"
+ gint _tmp55_;
+ gint _tmp56_;
gint xmin = 0;
- gint _tmp57_ = 0;
- gint* _tmp58_ = NULL;
- gint _tmp58__length1 = 0;
- gint _tmp59_ = 0;
- gint _tmp60_ = 0;
+ gint _tmp57_;
+ gint* _tmp58_;
+ gint _tmp58__length1;
+ gint _tmp59_;
+ gint _tmp60_;
gint _tmp61_ = 0;
- gint _tmp62_ = 0;
+ gint _tmp62_;
gint xmax = 0;
- gint _tmp64_ = 0;
- gint* _tmp65_ = NULL;
- gint _tmp65__length1 = 0;
- gint _tmp66_ = 0;
- gint _tmp67_ = 0;
+ gint _tmp64_;
+ gint* _tmp65_;
+ gint _tmp65__length1;
+ gint _tmp66_;
+ gint _tmp67_;
gint _tmp68_ = 0;
- gint _tmp69_ = 0;
- GdkPixbuf* _tmp70_ = NULL;
- gint _tmp71_ = 0;
- gint _tmp72_ = 0;
- gint _tmp87_ = 0;
+ gint _tmp69_;
+ GdkPixbuf* _tmp70_;
+ gint _tmp71_;
+ gint _tmp72_;
+ gint _tmp87_;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp53_) {
-#line 30693 "Photo.c"
- gint _tmp54_ = 0;
+#line 30671 "Photo.c"
+ gint _tmp54_;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp54_ = y_it;
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
y_it = _tmp54_ + 1;
-#line 30699 "Photo.c"
+#line 30677 "Photo.c"
}
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp53_ = FALSE;
@@ -30712,7 +30690,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (!(_tmp55_ <= _tmp56_)) {
#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 30711 "Photo.c"
+#line 30689 "Photo.c"
}
#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = x_bounds_min;
@@ -30732,14 +30710,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (_tmp62_ < 0) {
#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = 0;
-#line 30731 "Photo.c"
+#line 30709 "Photo.c"
} else {
- gint _tmp63_ = 0;
+ gint _tmp63_;
#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp63_ = xmin;
#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = _tmp63_;
-#line 30738 "Photo.c"
+#line 30716 "Photo.c"
}
#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
xmin = _tmp61_;
@@ -30765,10 +30743,10 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp72_ = _tmp71_;
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp69_ > (_tmp72_ - 1)) {
-#line 30764 "Photo.c"
- GdkPixbuf* _tmp73_ = NULL;
- gint _tmp74_ = 0;
- gint _tmp75_ = 0;
+#line 30742 "Photo.c"
+ GdkPixbuf* _tmp73_;
+ gint _tmp74_;
+ gint _tmp75_;
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp73_ = pixbuf;
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -30777,49 +30755,49 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp75_ = _tmp74_;
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp68_ = _tmp75_ - 1;
-#line 30776 "Photo.c"
+#line 30754 "Photo.c"
} else {
- gint _tmp76_ = 0;
+ gint _tmp76_;
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp76_ = xmax;
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp68_ = _tmp76_;
-#line 30783 "Photo.c"
+#line 30761 "Photo.c"
}
#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
xmax = _tmp68_;
-#line 30787 "Photo.c"
+#line 30765 "Photo.c"
{
gint x_it = 0;
- gint _tmp77_ = 0;
+ gint _tmp77_;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp77_ = xmin;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
x_it = _tmp77_;
-#line 30795 "Photo.c"
+#line 30773 "Photo.c"
{
gboolean _tmp78_ = FALSE;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = TRUE;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 30802 "Photo.c"
- gint _tmp80_ = 0;
- gint _tmp81_ = 0;
- GdkPixbuf* _tmp82_ = NULL;
- gint _tmp83_ = 0;
- gint _tmp84_ = 0;
- GdkPixbuf* _tmp85_ = NULL;
- GdkPixbuf* _tmp86_ = NULL;
+#line 30780 "Photo.c"
+ gint _tmp80_;
+ gint _tmp81_;
+ GdkPixbuf* _tmp82_;
+ gint _tmp83_;
+ gint _tmp84_;
+ GdkPixbuf* _tmp85_;
+ GdkPixbuf* _tmp86_;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp78_) {
-#line 30812 "Photo.c"
- gint _tmp79_ = 0;
+#line 30790 "Photo.c"
+ gint _tmp79_;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp79_ = x_it;
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
x_it = _tmp79_ + 1;
-#line 30818 "Photo.c"
+#line 30796 "Photo.c"
}
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = FALSE;
@@ -30831,7 +30809,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (!(_tmp80_ <= _tmp81_)) {
#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 30830 "Photo.c"
+#line 30808 "Photo.c"
}
#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp82_ = pixbuf;
@@ -30845,7 +30823,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp86_ = _tmp85_;
#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp86_);
-#line 30844 "Photo.c"
+#line 30822 "Photo.c"
}
}
}
@@ -30853,7 +30831,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp87_ = inset_index;
#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
inset_index = _tmp87_ + 1;
-#line 30852 "Photo.c"
+#line 30830 "Photo.c"
}
}
}
@@ -30883,53 +30861,53 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp96__length1 = x_insets_first_quadrant_length1;
#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
inset_index = _tmp96__length1 - 1;
-#line 30882 "Photo.c"
+#line 30860 "Photo.c"
{
gint y_it = 0;
- gint _tmp97_ = 0;
+ gint _tmp97_;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp97_ = ymin;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
y_it = _tmp97_;
-#line 30890 "Photo.c"
+#line 30868 "Photo.c"
{
gboolean _tmp98_ = FALSE;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp98_ = TRUE;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 30897 "Photo.c"
- gint _tmp100_ = 0;
- gint _tmp101_ = 0;
+#line 30875 "Photo.c"
+ gint _tmp100_;
+ gint _tmp101_;
gint xmin = 0;
- gint _tmp102_ = 0;
- gint* _tmp103_ = NULL;
- gint _tmp103__length1 = 0;
- gint _tmp104_ = 0;
- gint _tmp105_ = 0;
+ gint _tmp102_;
+ gint* _tmp103_;
+ gint _tmp103__length1;
+ gint _tmp104_;
+ gint _tmp105_;
gint _tmp106_ = 0;
- gint _tmp107_ = 0;
+ gint _tmp107_;
gint xmax = 0;
- gint _tmp109_ = 0;
- gint* _tmp110_ = NULL;
- gint _tmp110__length1 = 0;
- gint _tmp111_ = 0;
- gint _tmp112_ = 0;
+ gint _tmp109_;
+ gint* _tmp110_;
+ gint _tmp110__length1;
+ gint _tmp111_;
+ gint _tmp112_;
gint _tmp113_ = 0;
- gint _tmp114_ = 0;
- GdkPixbuf* _tmp115_ = NULL;
- gint _tmp116_ = 0;
- gint _tmp117_ = 0;
- gint _tmp132_ = 0;
+ gint _tmp114_;
+ GdkPixbuf* _tmp115_;
+ gint _tmp116_;
+ gint _tmp117_;
+ gint _tmp132_;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp98_) {
-#line 30922 "Photo.c"
- gint _tmp99_ = 0;
+#line 30900 "Photo.c"
+ gint _tmp99_;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp99_ = y_it;
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
y_it = _tmp99_ + 1;
-#line 30928 "Photo.c"
+#line 30906 "Photo.c"
}
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp98_ = FALSE;
@@ -30941,7 +30919,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (!(_tmp100_ <= _tmp101_)) {
#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 30940 "Photo.c"
+#line 30918 "Photo.c"
}
#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp102_ = x_bounds_min;
@@ -30961,14 +30939,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (_tmp107_ < 0) {
#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp106_ = 0;
-#line 30960 "Photo.c"
+#line 30938 "Photo.c"
} else {
- gint _tmp108_ = 0;
+ gint _tmp108_;
#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp108_ = xmin;
#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp106_ = _tmp108_;
-#line 30967 "Photo.c"
+#line 30945 "Photo.c"
}
#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
xmin = _tmp106_;
@@ -30994,10 +30972,10 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp117_ = _tmp116_;
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp114_ > (_tmp117_ - 1)) {
-#line 30993 "Photo.c"
- GdkPixbuf* _tmp118_ = NULL;
- gint _tmp119_ = 0;
- gint _tmp120_ = 0;
+#line 30971 "Photo.c"
+ GdkPixbuf* _tmp118_;
+ gint _tmp119_;
+ gint _tmp120_;
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp118_ = pixbuf;
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31006,49 +30984,49 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp120_ = _tmp119_;
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp113_ = _tmp120_ - 1;
-#line 31005 "Photo.c"
+#line 30983 "Photo.c"
} else {
- gint _tmp121_ = 0;
+ gint _tmp121_;
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp121_ = xmax;
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp113_ = _tmp121_;
-#line 31012 "Photo.c"
+#line 30990 "Photo.c"
}
#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
xmax = _tmp113_;
-#line 31016 "Photo.c"
+#line 30994 "Photo.c"
{
gint x_it = 0;
- gint _tmp122_ = 0;
+ gint _tmp122_;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp122_ = xmin;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
x_it = _tmp122_;
-#line 31024 "Photo.c"
+#line 31002 "Photo.c"
{
gboolean _tmp123_ = FALSE;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp123_ = TRUE;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 31031 "Photo.c"
- gint _tmp125_ = 0;
- gint _tmp126_ = 0;
- GdkPixbuf* _tmp127_ = NULL;
- gint _tmp128_ = 0;
- gint _tmp129_ = 0;
- GdkPixbuf* _tmp130_ = NULL;
- GdkPixbuf* _tmp131_ = NULL;
+#line 31009 "Photo.c"
+ gint _tmp125_;
+ gint _tmp126_;
+ GdkPixbuf* _tmp127_;
+ gint _tmp128_;
+ gint _tmp129_;
+ GdkPixbuf* _tmp130_;
+ GdkPixbuf* _tmp131_;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp123_) {
-#line 31041 "Photo.c"
- gint _tmp124_ = 0;
+#line 31019 "Photo.c"
+ gint _tmp124_;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp124_ = x_it;
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
x_it = _tmp124_ + 1;
-#line 31047 "Photo.c"
+#line 31025 "Photo.c"
}
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp123_ = FALSE;
@@ -31060,7 +31038,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
if (!(_tmp125_ <= _tmp126_)) {
#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 31059 "Photo.c"
+#line 31037 "Photo.c"
}
#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp127_ = pixbuf;
@@ -31074,7 +31052,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp131_ = _tmp130_;
#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp131_);
-#line 31073 "Photo.c"
+#line 31051 "Photo.c"
}
}
}
@@ -31082,7 +31060,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
_tmp132_ = inset_index;
#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
inset_index = _tmp132_ - 1;
-#line 31081 "Photo.c"
+#line 31059 "Photo.c"
}
}
}
@@ -31096,25 +31074,25 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL);
#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31095 "Photo.c"
+#line 31073 "Photo.c"
}
static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x, gint y) {
GdkPixbuf* result = NULL;
gint px_start_byte_offset = 0;
- gint _tmp0_ = 0;
- GdkPixbuf* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- GdkPixbuf* _tmp4_ = NULL;
- gint _tmp5_ = 0;
+ gint _tmp0_;
+ GdkPixbuf* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ GdkPixbuf* _tmp4_;
+ gint _tmp5_;
gboolean _tmp6_ = FALSE;
gboolean _tmp7_ = FALSE;
gboolean _tmp8_ = FALSE;
- gint _tmp9_ = 0;
- GdkPixbuf* _tmp33_ = NULL;
- GdkPixbuf* _tmp34_ = NULL;
+ gint _tmp9_;
+ GdkPixbuf* _tmp33_;
+ GdkPixbuf* _tmp34_;
#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31137,25 +31115,25 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
_tmp9_ = x;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp9_ >= 0) {
-#line 31136 "Photo.c"
- gint _tmp10_ = 0;
+#line 31114 "Photo.c"
+ gint _tmp10_;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = y;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _tmp10_ >= 0;
-#line 31142 "Photo.c"
+#line 31120 "Photo.c"
} else {
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = FALSE;
-#line 31146 "Photo.c"
+#line 31124 "Photo.c"
}
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
-#line 31150 "Photo.c"
- gint _tmp11_ = 0;
- GdkPixbuf* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+#line 31128 "Photo.c"
+ gint _tmp11_;
+ GdkPixbuf* _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = x;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31166,19 +31144,19 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
_tmp14_ = _tmp13_;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _tmp11_ < _tmp14_;
-#line 31165 "Photo.c"
+#line 31143 "Photo.c"
} else {
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = FALSE;
-#line 31169 "Photo.c"
+#line 31147 "Photo.c"
}
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp7_) {
-#line 31173 "Photo.c"
- gint _tmp15_ = 0;
- GdkPixbuf* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
+#line 31151 "Photo.c"
+ gint _tmp15_;
+ GdkPixbuf* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = y;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31189,38 +31167,38 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
_tmp18_ = _tmp17_;
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp15_ < _tmp18_;
-#line 31188 "Photo.c"
+#line 31166 "Photo.c"
} else {
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = FALSE;
-#line 31192 "Photo.c"
+#line 31170 "Photo.c"
}
#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_) {
-#line 31196 "Photo.c"
+#line 31174 "Photo.c"
guchar* pixel_data = NULL;
- GdkPixbuf* _tmp19_ = NULL;
- guint8* _tmp20_ = NULL;
- gint pixel_data_length1 = 0;
- gint _pixel_data_size_ = 0;
+ GdkPixbuf* _tmp19_;
+ guint8* _tmp20_;
+ gint pixel_data_length1;
+ gint _pixel_data_size_;
guchar g = '\0';
- guchar* _tmp21_ = NULL;
- gint _tmp21__length1 = 0;
- gint _tmp22_ = 0;
- guchar _tmp23_ = '\0';
+ guchar* _tmp21_;
+ gint _tmp21__length1;
+ gint _tmp22_;
+ guchar _tmp23_;
guchar b = '\0';
- guchar* _tmp24_ = NULL;
- gint _tmp24__length1 = 0;
- gint _tmp25_ = 0;
- guchar _tmp26_ = '\0';
+ guchar* _tmp24_;
+ gint _tmp24__length1;
+ gint _tmp25_;
+ guchar _tmp26_;
guchar r = '\0';
- guchar _tmp27_ = '\0';
- guchar _tmp28_ = '\0';
- guchar* _tmp29_ = NULL;
- gint _tmp29__length1 = 0;
- gint _tmp30_ = 0;
- guchar _tmp31_ = '\0';
- guchar _tmp32_ = '\0';
+ guchar _tmp27_;
+ guchar _tmp28_;
+ guchar* _tmp29_;
+ gint _tmp29__length1;
+ gint _tmp30_;
+ guchar _tmp31_;
+ guchar _tmp32_;
#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = pixbuf;
#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31269,7 +31247,7 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
_tmp29_[_tmp30_] = _tmp31_;
#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = _tmp29_[_tmp30_];
-#line 31268 "Photo.c"
+#line 31246 "Photo.c"
}
#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp33_ = pixbuf;
@@ -31279,31 +31257,31 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
result = _tmp34_;
#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31278 "Photo.c"
+#line 31256 "Photo.c"
}
void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoint* result) {
Orientation unscaled_orientation = 0;
- Orientation _tmp0_ = 0;
+ Orientation _tmp0_;
Dimensions unscaled_dims = {0};
- Orientation _tmp1_ = 0;
+ Orientation _tmp1_;
Dimensions _tmp2_ = {0};
Dimensions _tmp3_ = {0};
gint unscaled_x_offset_raw = 0;
gint unscaled_y_offset_raw = 0;
Box crop_box = {0};
Box _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
GdkPoint derotated_point = {0};
- Orientation _tmp10_ = 0;
- Dimensions _tmp11_ = {0};
- GdkPoint _tmp12_ = {0};
+ Orientation _tmp10_;
+ Dimensions _tmp11_;
+ GdkPoint _tmp12_;
GdkPoint _tmp13_ = {0};
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
+ gint _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31330,11 +31308,11 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
crop_box = _tmp4_;
#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 31329 "Photo.c"
- Box _tmp6_ = {0};
- gint _tmp7_ = 0;
- Box _tmp8_ = {0};
- gint _tmp9_ = 0;
+#line 31307 "Photo.c"
+ Box _tmp6_;
+ gint _tmp7_;
+ Box _tmp8_;
+ gint _tmp9_;
#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = crop_box;
#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31347,7 +31325,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
_tmp9_ = _tmp8_.top;
#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
unscaled_y_offset_raw = _tmp9_;
-#line 31346 "Photo.c"
+#line 31324 "Photo.c"
}
#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = unscaled_orientation;
@@ -31375,7 +31353,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
*result = derotated_point;
#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 31374 "Photo.c"
+#line 31352 "Photo.c"
}
@@ -31384,43 +31362,43 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
GdkPoint _tmp0_ = {0};
GdkPoint lower_right = {0};
GdkPoint _tmp1_ = {0};
- GdkRectangle _tmp2_ = {0};
- gint _tmp3_ = 0;
- GdkRectangle _tmp4_ = {0};
- gint _tmp5_ = 0;
- GdkPoint _tmp6_ = {0};
- gint _tmp7_ = 0;
- GdkRectangle _tmp8_ = {0};
- gint _tmp9_ = 0;
- GdkPoint _tmp10_ = {0};
- gint _tmp11_ = 0;
- GdkRectangle _tmp12_ = {0};
- gint _tmp13_ = 0;
- GdkPoint _tmp14_ = {0};
+ GdkRectangle _tmp2_;
+ gint _tmp3_;
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
+ GdkPoint _tmp6_;
+ gint _tmp7_;
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ GdkPoint _tmp10_;
+ gint _tmp11_;
+ GdkRectangle _tmp12_;
+ gint _tmp13_;
+ GdkPoint _tmp14_;
GdkPoint _tmp15_ = {0};
- GdkPoint _tmp16_ = {0};
+ GdkPoint _tmp16_;
GdkPoint _tmp17_ = {0};
- GdkPoint _tmp18_ = {0};
- gint _tmp19_ = 0;
- GdkPoint _tmp20_ = {0};
- gint _tmp21_ = 0;
- GdkPoint _tmp27_ = {0};
- gint _tmp28_ = 0;
- GdkPoint _tmp29_ = {0};
- gint _tmp30_ = 0;
+ GdkPoint _tmp18_;
+ gint _tmp19_;
+ GdkPoint _tmp20_;
+ gint _tmp21_;
+ GdkPoint _tmp27_;
+ gint _tmp28_;
+ GdkPoint _tmp29_;
+ gint _tmp30_;
GdkRectangle raw_rect = {0};
- GdkPoint _tmp36_ = {0};
- gint _tmp37_ = 0;
- GdkPoint _tmp38_ = {0};
- gint _tmp39_ = 0;
- GdkPoint _tmp40_ = {0};
- gint _tmp41_ = 0;
- GdkPoint _tmp42_ = {0};
- gint _tmp43_ = 0;
- GdkPoint _tmp44_ = {0};
- gint _tmp45_ = 0;
- GdkPoint _tmp46_ = {0};
- gint _tmp47_ = 0;
+ GdkPoint _tmp36_;
+ gint _tmp37_;
+ GdkPoint _tmp38_;
+ gint _tmp39_;
+ GdkPoint _tmp40_;
+ gint _tmp41_;
+ GdkPoint _tmp42_;
+ gint _tmp43_;
+ GdkPoint _tmp44_;
+ gint _tmp45_;
+ GdkPoint _tmp46_;
+ gint _tmp47_;
#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_PHOTO (self));
#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31487,13 +31465,13 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
_tmp21_ = _tmp20_.x;
#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp19_ > _tmp21_) {
-#line 31486 "Photo.c"
+#line 31464 "Photo.c"
gint temp = 0;
- GdkPoint _tmp22_ = {0};
- gint _tmp23_ = 0;
- GdkPoint _tmp24_ = {0};
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
+ GdkPoint _tmp22_;
+ gint _tmp23_;
+ GdkPoint _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = upper_left;
#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31510,7 +31488,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
_tmp26_ = temp;
#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
lower_right.x = _tmp26_;
-#line 31509 "Photo.c"
+#line 31487 "Photo.c"
}
#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = upper_left;
@@ -31522,13 +31500,13 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
_tmp30_ = _tmp29_.y;
#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp28_ > _tmp30_) {
-#line 31521 "Photo.c"
+#line 31499 "Photo.c"
gint temp = 0;
- GdkPoint _tmp31_ = {0};
- gint _tmp32_ = 0;
- GdkPoint _tmp33_ = {0};
- gint _tmp34_ = 0;
- gint _tmp35_ = 0;
+ GdkPoint _tmp31_;
+ gint _tmp32_;
+ GdkPoint _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = upper_left;
#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31545,7 +31523,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
_tmp35_ = temp;
#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
lower_right.y = _tmp35_;
-#line 31544 "Photo.c"
+#line 31522 "Photo.c"
}
#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
memset (&raw_rect, 0, sizeof (GdkRectangle));
@@ -31585,7 +31563,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
*result = raw_rect;
#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 31584 "Photo.c"
+#line 31562 "Photo.c"
}
@@ -31593,19 +31571,19 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
PixelTransformationBundle* result = NULL;
GdkPixbuf* pixbuf = NULL;
PixelTransformationBundle* transformations = NULL;
- GdkPixbuf* _tmp4_ = NULL;
- PixelTransformationBundle* _tmp5_ = NULL;
+ GdkPixbuf* _tmp4_;
+ PixelTransformationBundle* _tmp5_;
GError * _inner_error_ = NULL;
#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), NULL);
#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
pixbuf = NULL;
-#line 31599 "Photo.c"
+#line 31577 "Photo.c"
{
GdkPixbuf* _tmp0_ = NULL;
Scaling _tmp1_ = {0};
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
scaling_for_best_fit (360, FALSE, &_tmp1_);
#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31614,8 +31592,8 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
_tmp0_ = _tmp2_;
#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31613 "Photo.c"
- goto __catch404_g_error;
+#line 31591 "Photo.c"
+ goto __catch405_g_error;
}
#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp0_;
@@ -31627,10 +31605,10 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
pixbuf = _tmp3_;
#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp0_);
-#line 31626 "Photo.c"
+#line 31604 "Photo.c"
}
- goto __finally404;
- __catch404_g_error:
+ goto __finally405;
+ __catch405_g_error:
{
GError* e = NULL;
#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31647,9 +31625,9 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
_g_object_unref0 (pixbuf);
#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31646 "Photo.c"
+#line 31624 "Photo.c"
}
- __finally404:
+ __finally405:
#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31660,7 +31638,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
g_clear_error (&_inner_error_);
#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 31659 "Photo.c"
+#line 31637 "Photo.c"
}
#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = pixbuf;
@@ -31674,15 +31652,15 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
_g_object_unref0 (pixbuf);
#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31673 "Photo.c"
+#line 31651 "Photo.c"
}
gboolean photo_enhance (Photo* self) {
gboolean result = FALSE;
PixelTransformationBundle* transformations = NULL;
- PixelTransformationBundle* _tmp0_ = NULL;
- PixelTransformationBundle* _tmp1_ = NULL;
+ PixelTransformationBundle* _tmp0_;
+ PixelTransformationBundle* _tmp1_;
GError * _inner_error_ = NULL;
#line 4423 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -31700,35 +31678,35 @@ gboolean photo_enhance (Photo* self) {
_pixel_transformation_bundle_unref0 (transformations);
#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31699 "Photo.c"
+#line 31677 "Photo.c"
}
{
- PhotoRow* _tmp2_ = NULL;
+ PhotoRow* _tmp2_;
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->row;
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31707 "Photo.c"
+#line 31685 "Photo.c"
{
- PixelTransformationBundle* _tmp3_ = NULL;
+ PixelTransformationBundle* _tmp3_;
#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = transformations;
#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
photo_set_color_adjustments (self, _tmp3_);
-#line 31714 "Photo.c"
+#line 31692 "Photo.c"
}
- __finally405:
+ __finally406:
{
- PhotoRow* _tmp4_ = NULL;
+ PhotoRow* _tmp4_;
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->row;
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31723 "Photo.c"
+#line 31701 "Photo.c"
}
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31727 "Photo.c"
+#line 31705 "Photo.c"
gboolean _tmp5_ = FALSE;
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformation_bundle_unref0 (transformations);
@@ -31738,7 +31716,7 @@ gboolean photo_enhance (Photo* self) {
g_clear_error (&_inner_error_);
#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp5_;
-#line 31737 "Photo.c"
+#line 31715 "Photo.c"
}
}
#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31747,30 +31725,30 @@ gboolean photo_enhance (Photo* self) {
_pixel_transformation_bundle_unref0 (transformations);
#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31746 "Photo.c"
+#line 31724 "Photo.c"
}
gboolean photo_get_develop_raw_photos_to_files (void) {
gboolean result;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 349 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo__develop_raw_photos_to_files;
#line 349 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 349 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31759 "Photo.c"
+#line 31737 "Photo.c"
}
void photo_set_develop_raw_photos_to_files (gboolean value) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 349 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = value;
#line 349 "/home/jens/Source/shotwell/src/Photo.vala"
photo__develop_raw_photos_to_files = _tmp0_;
-#line 31769 "Photo.c"
+#line 31747 "Photo.c"
}
@@ -31779,7 +31757,7 @@ static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* n
g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
#line 358 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 31778 "Photo.c"
+#line 31756 "Photo.c"
}
@@ -31798,19 +31776,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
data1 = closure->data;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
data2 = param_values->data[0].v_pointer;
-#line 31797 "Photo.c"
+#line 31775 "Photo.c"
} else {
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
data1 = param_values->data[0].v_pointer;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
data2 = closure->data;
-#line 31803 "Photo.c"
+#line 31781 "Photo.c"
}
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 31809 "Photo.c"
+#line 31787 "Photo.c"
}
@@ -31825,7 +31803,7 @@ static void photo_real_baseline_replaced (Photo* self) {
static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) {
#line 376 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31824 "Photo.c"
+#line 31802 "Photo.c"
}
@@ -31844,62 +31822,62 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV
data1 = closure->data;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
data2 = param_values->data[0].v_pointer;
-#line 31843 "Photo.c"
+#line 31821 "Photo.c"
} else {
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
data1 = param_values->data[0].v_pointer;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
data2 = closure->data;
-#line 31849 "Photo.c"
+#line 31827 "Photo.c"
}
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
callback (data1, value_get_media_metadata (param_values + 1), data2);
-#line 31855 "Photo.c"
+#line 31833 "Photo.c"
}
static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) {
#line 380 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31862 "Photo.c"
+#line 31840 "Photo.c"
}
static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
#line 387 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31869 "Photo.c"
+#line 31847 "Photo.c"
}
static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) {
#line 394 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31876 "Photo.c"
+#line 31854 "Photo.c"
}
static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) {
#line 257 "/home/jens/Source/shotwell/src/Photo.vala"
photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self);
-#line 31883 "Photo.c"
+#line 31861 "Photo.c"
}
static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_construct (GType object_type, Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) {
PhotoPhotoTransformationStateImpl * self = NULL;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Orientation _tmp2_ = 0;
- GeeHashMap* _tmp3_ = NULL;
- GeeHashMap* _tmp4_ = NULL;
- PixelTransformer* _tmp5_ = NULL;
- PixelTransformer* _tmp6_ = NULL;
- PixelTransformationBundle* _tmp7_ = NULL;
- PixelTransformationBundle* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ Orientation _tmp2_;
+ GeeHashMap* _tmp3_;
+ GeeHashMap* _tmp4_;
+ PixelTransformer* _tmp5_;
+ PixelTransformer* _tmp6_;
+ PixelTransformationBundle* _tmp7_;
+ PixelTransformationBundle* _tmp8_;
+ Photo* _tmp9_;
#line 244 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 244 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31952,20 +31930,20 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_
g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0);
#line 244 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 31951 "Photo.c"
+#line 31929 "Photo.c"
}
static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) {
#line 244 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments);
-#line 31958 "Photo.c"
+#line 31936 "Photo.c"
}
static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoPhotoTransformationStateImpl* self) {
Orientation result = 0;
- Orientation _tmp0_ = 0;
+ Orientation _tmp0_;
#line 260 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), 0);
#line 261 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31974,14 +31952,14 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP
result = _tmp0_;
#line 261 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31973 "Photo.c"
+#line 31951 "Photo.c"
}
static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (PhotoPhotoTransformationStateImpl* self) {
GeeHashMap* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeHashMap* _tmp1_;
#line 264 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), NULL);
#line 265 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31992,23 +31970,23 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph
result = _tmp1_;
#line 265 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 31991 "Photo.c"
+#line 31969 "Photo.c"
}
static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (PhotoPhotoTransformationStateImpl* self) {
PixelTransformer* result = NULL;
PixelTransformer* _tmp0_ = NULL;
- PixelTransformer* _tmp1_ = NULL;
+ PixelTransformer* _tmp1_;
#line 268 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), NULL);
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->transformer;
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ != NULL) {
-#line 32005 "Photo.c"
- PixelTransformer* _tmp2_ = NULL;
- PixelTransformer* _tmp3_ = NULL;
+#line 31983 "Photo.c"
+ PixelTransformer* _tmp2_;
+ PixelTransformer* _tmp3_;
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->transformer;
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32017,35 +31995,35 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
_pixel_transformer_unref0 (_tmp0_);
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp3_;
-#line 32016 "Photo.c"
+#line 31994 "Photo.c"
} else {
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformer_unref0 (_tmp0_);
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = NULL;
-#line 32022 "Photo.c"
+#line 32000 "Photo.c"
}
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 269 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 32028 "Photo.c"
+#line 32006 "Photo.c"
}
static PixelTransformationBundle* photo_photo_transformation_state_impl_get_color_adjustments (PhotoPhotoTransformationStateImpl* self) {
PixelTransformationBundle* result = NULL;
PixelTransformationBundle* _tmp0_ = NULL;
- PixelTransformationBundle* _tmp1_ = NULL;
+ PixelTransformationBundle* _tmp1_;
#line 272 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self), NULL);
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->adjustments;
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_ != NULL) {
-#line 32042 "Photo.c"
- PixelTransformationBundle* _tmp2_ = NULL;
- PixelTransformationBundle* _tmp3_ = NULL;
+#line 32020 "Photo.c"
+ PixelTransformationBundle* _tmp2_;
+ PixelTransformationBundle* _tmp3_;
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->adjustments;
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32054,27 +32032,27 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
_pixel_transformation_bundle_unref0 (_tmp0_);
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp3_;
-#line 32053 "Photo.c"
+#line 32031 "Photo.c"
} else {
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
_pixel_transformation_bundle_unref0 (_tmp0_);
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = NULL;
-#line 32059 "Photo.c"
+#line 32037 "Photo.c"
}
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp0_;
#line 273 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 32065 "Photo.c"
+#line 32043 "Photo.c"
}
static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (GeeHashMap* original) {
GeeHashMap* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
GeeHashMap* clone = NULL;
- GeeHashMap* _tmp1_ = NULL;
+ GeeHashMap* _tmp1_;
#line 276 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail ((original == NULL) || GEE_IS_HASH_MAP (original), NULL);
#line 278 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32085,21 +32063,21 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
result = NULL;
#line 279 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 32084 "Photo.c"
+#line 32062 "Photo.c"
}
#line 281 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 281 "/home/jens/Source/shotwell/src/Photo.vala"
clone = _tmp1_;
-#line 32090 "Photo.c"
+#line 32068 "Photo.c"
{
GeeIterator* _object_it = NULL;
- GeeHashMap* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeHashMap* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeSet* _tmp5_;
+ GeeIterator* _tmp6_;
+ GeeIterator* _tmp7_;
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = original;
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32118,20 +32096,20 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
_object_it = _tmp7_;
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 32117 "Photo.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 32095 "Photo.c"
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
gchar* object = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- GeeHashMap* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- GeeHashMap* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gpointer _tmp16_ = NULL;
- KeyValueMap* _tmp17_ = NULL;
- KeyValueMap* _tmp18_ = NULL;
- KeyValueMap* _tmp19_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ GeeHashMap* _tmp12_;
+ const gchar* _tmp13_;
+ GeeHashMap* _tmp14_;
+ const gchar* _tmp15_;
+ gpointer _tmp16_;
+ KeyValueMap* _tmp17_;
+ KeyValueMap* _tmp18_;
+ KeyValueMap* _tmp19_;
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _object_it;
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32140,7 +32118,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
if (!_tmp9_) {
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 32139 "Photo.c"
+#line 32117 "Photo.c"
}
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = _object_it;
@@ -32172,22 +32150,22 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
_key_value_map_unref0 (_tmp17_);
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (object);
-#line 32171 "Photo.c"
+#line 32149 "Photo.c"
}
#line 282 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_object_it);
-#line 32175 "Photo.c"
+#line 32153 "Photo.c"
}
#line 285 "/home/jens/Source/shotwell/src/Photo.vala"
result = clone;
#line 285 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 32181 "Photo.c"
+#line 32159 "Photo.c"
}
static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (PhotoPhotoTransformationStateImpl* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 288 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (PHOTO_IS_PHOTO_TRANSFORMATION_STATE_IMPL (self));
#line 289 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32195,8 +32173,8 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph
#line 289 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp0_) {
#line 290 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), "broken");
-#line 32195 "Photo.c"
+ g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL], 0);
+#line 32173 "Photo.c"
}
}
@@ -32208,21 +32186,21 @@ static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransfor
g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate));
#line 237 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize;
-#line 32207 "Photo.c"
+#line 32185 "Photo.c"
}
static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) {
#line 237 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self);
-#line 32214 "Photo.c"
+#line 32192 "Photo.c"
}
-static void photo_photo_transformation_state_impl_finalize (GObject* obj) {
+static void photo_photo_transformation_state_impl_finalize (GObject * obj) {
PhotoPhotoTransformationStateImpl * self;
- Photo* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ Photo* _tmp0_;
+ guint _tmp1_;
#line 237 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, PhotoPhotoTransformationStateImpl);
#line 257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32241,7 +32219,7 @@ static void photo_photo_transformation_state_impl_finalize (GObject* obj) {
_pixel_transformation_bundle_unref0 (self->priv->adjustments);
#line 237 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (photo_photo_transformation_state_impl_parent_class)->finalize (obj);
-#line 32240 "Photo.c"
+#line 32218 "Photo.c"
}
@@ -32263,21 +32241,21 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type)
self = (PhotoBackingReaders*) g_type_create_instance (object_type);
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 32262 "Photo.c"
+#line 32240 "Photo.c"
}
static PhotoBackingReaders* photo_backing_readers_new (void) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS);
-#line 32269 "Photo.c"
+#line 32247 "Photo.c"
}
static void photo_value_backing_readers_init (GValue* value) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32276 "Photo.c"
+#line 32254 "Photo.c"
}
@@ -32286,7 +32264,7 @@ static void photo_value_backing_readers_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
photo_backing_readers_unref (value->data[0].v_pointer);
-#line 32285 "Photo.c"
+#line 32263 "Photo.c"
}
}
@@ -32296,11 +32274,11 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
if (src_value->data[0].v_pointer) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer);
-#line 32295 "Photo.c"
+#line 32273 "Photo.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 32299 "Photo.c"
+#line 32277 "Photo.c"
}
}
@@ -32308,66 +32286,66 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 32307 "Photo.c"
+#line 32285 "Photo.c"
}
static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 32314 "Photo.c"
- PhotoBackingReaders* object;
+#line 32292 "Photo.c"
+ PhotoBackingReaders * object;
object = collect_values[0].v_pointer;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32321 "Photo.c"
+#line 32299 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 294 "/home/jens/Source/shotwell/src/Photo.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 32325 "Photo.c"
+#line 32303 "Photo.c"
}
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32329 "Photo.c"
+#line 32307 "Photo.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32333 "Photo.c"
+#line 32311 "Photo.c"
}
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 32337 "Photo.c"
+#line 32315 "Photo.c"
}
static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoBackingReaders** object_p;
+ PhotoBackingReaders ** object_p;
object_p = collect_values[0].v_pointer;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32348 "Photo.c"
+#line 32326 "Photo.c"
}
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 32354 "Photo.c"
+#line 32332 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 32358 "Photo.c"
+#line 32336 "Photo.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32362 "Photo.c"
+#line 32340 "Photo.c"
}
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 32366 "Photo.c"
+#line 32344 "Photo.c"
}
@@ -32381,7 +32359,7 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc
G_PARAM_SPEC (spec)->value_type = object_type;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 32380 "Photo.c"
+#line 32358 "Photo.c"
}
@@ -32390,12 +32368,12 @@ static gpointer photo_value_get_backing_readers (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL);
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 32389 "Photo.c"
+#line 32367 "Photo.c"
}
static void photo_value_set_backing_readers (GValue* value, gpointer v_object) {
- PhotoBackingReaders* old;
+ PhotoBackingReaders * old;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS));
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32410,23 +32388,23 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32409 "Photo.c"
+#line 32387 "Photo.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32413 "Photo.c"
+#line 32391 "Photo.c"
}
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
photo_backing_readers_unref (old);
-#line 32419 "Photo.c"
+#line 32397 "Photo.c"
}
}
static void photo_value_take_backing_readers (GValue* value, gpointer v_object) {
- PhotoBackingReaders* old;
+ PhotoBackingReaders * old;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS));
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32439,17 +32417,17 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 32438 "Photo.c"
+#line 32416 "Photo.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32442 "Photo.c"
+#line 32420 "Photo.c"
}
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
photo_backing_readers_unref (old);
-#line 32448 "Photo.c"
+#line 32426 "Photo.c"
}
}
@@ -32459,18 +32437,18 @@ static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass)
photo_backing_readers_parent_class = g_type_class_peek_parent (klass);
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize;
-#line 32458 "Photo.c"
+#line 32436 "Photo.c"
}
static void photo_backing_readers_instance_init (PhotoBackingReaders * self) {
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 32465 "Photo.c"
+#line 32443 "Photo.c"
}
-static void photo_backing_readers_finalize (PhotoBackingReaders* obj) {
+static void photo_backing_readers_finalize (PhotoBackingReaders * obj) {
PhotoBackingReaders * self;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_BACKING_READERS, PhotoBackingReaders);
@@ -32482,7 +32460,7 @@ static void photo_backing_readers_finalize (PhotoBackingReaders* obj) {
_photo_file_adapter_unref0 (self->developer);
#line 297 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_file_adapter_unref0 (self->editable);
-#line 32481 "Photo.c"
+#line 32459 "Photo.c"
}
@@ -32501,18 +32479,18 @@ static GType photo_backing_readers_get_type (void) {
static gpointer photo_backing_readers_ref (gpointer instance) {
- PhotoBackingReaders* self;
+ PhotoBackingReaders * self;
self = instance;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 32506 "Photo.c"
+#line 32484 "Photo.c"
}
static void photo_backing_readers_unref (gpointer instance) {
- PhotoBackingReaders* self;
+ PhotoBackingReaders * self;
self = instance;
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -32520,17 +32498,17 @@ static void photo_backing_readers_unref (gpointer instance) {
PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self);
#line 294 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 32519 "Photo.c"
+#line 32497 "Photo.c"
}
}
static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Photo* photo, GdkPixbuf* pixbuf) {
PhotoCachedPixbuf* self = NULL;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
#line 305 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 305 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32555,21 +32533,21 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot
self->pixbuf = _tmp3_;
#line 305 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 32554 "Photo.c"
+#line 32532 "Photo.c"
}
static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) {
#line 305 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf);
-#line 32561 "Photo.c"
+#line 32539 "Photo.c"
}
static void photo_value_cached_pixbuf_init (GValue* value) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32568 "Photo.c"
+#line 32546 "Photo.c"
}
@@ -32578,7 +32556,7 @@ static void photo_value_cached_pixbuf_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
photo_cached_pixbuf_unref (value->data[0].v_pointer);
-#line 32577 "Photo.c"
+#line 32555 "Photo.c"
}
}
@@ -32588,11 +32566,11 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
if (src_value->data[0].v_pointer) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer);
-#line 32587 "Photo.c"
+#line 32565 "Photo.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 32591 "Photo.c"
+#line 32569 "Photo.c"
}
}
@@ -32600,66 +32578,66 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 32599 "Photo.c"
+#line 32577 "Photo.c"
}
static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 32606 "Photo.c"
- PhotoCachedPixbuf* object;
+#line 32584 "Photo.c"
+ PhotoCachedPixbuf * object;
object = collect_values[0].v_pointer;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32613 "Photo.c"
+#line 32591 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 300 "/home/jens/Source/shotwell/src/Photo.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 32617 "Photo.c"
+#line 32595 "Photo.c"
}
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32621 "Photo.c"
+#line 32599 "Photo.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32625 "Photo.c"
+#line 32603 "Photo.c"
}
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 32629 "Photo.c"
+#line 32607 "Photo.c"
}
static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoCachedPixbuf** object_p;
+ PhotoCachedPixbuf ** object_p;
object_p = collect_values[0].v_pointer;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32640 "Photo.c"
+#line 32618 "Photo.c"
}
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 32646 "Photo.c"
+#line 32624 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 32650 "Photo.c"
+#line 32628 "Photo.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32654 "Photo.c"
+#line 32632 "Photo.c"
}
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 32658 "Photo.c"
+#line 32636 "Photo.c"
}
@@ -32673,7 +32651,7 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha
G_PARAM_SPEC (spec)->value_type = object_type;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 32672 "Photo.c"
+#line 32650 "Photo.c"
}
@@ -32682,12 +32660,12 @@ static gpointer photo_value_get_cached_pixbuf (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL);
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 32681 "Photo.c"
+#line 32659 "Photo.c"
}
static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) {
- PhotoCachedPixbuf* old;
+ PhotoCachedPixbuf * old;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF));
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32702,23 +32680,23 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32701 "Photo.c"
+#line 32679 "Photo.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32705 "Photo.c"
+#line 32683 "Photo.c"
}
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
photo_cached_pixbuf_unref (old);
-#line 32711 "Photo.c"
+#line 32689 "Photo.c"
}
}
static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) {
- PhotoCachedPixbuf* old;
+ PhotoCachedPixbuf * old;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF));
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32731,17 +32709,17 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 32730 "Photo.c"
+#line 32708 "Photo.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32734 "Photo.c"
+#line 32712 "Photo.c"
}
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
photo_cached_pixbuf_unref (old);
-#line 32740 "Photo.c"
+#line 32718 "Photo.c"
}
}
@@ -32751,23 +32729,23 @@ static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) {
photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass);
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize;
-#line 32750 "Photo.c"
+#line 32728 "Photo.c"
}
static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) {
- GTimer* _tmp0_ = NULL;
+ GTimer* _tmp0_;
#line 303 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = g_timer_new ();
#line 303 "/home/jens/Source/shotwell/src/Photo.vala"
self->last_touched = _tmp0_;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 32762 "Photo.c"
+#line 32740 "Photo.c"
}
-static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj) {
+static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) {
PhotoCachedPixbuf * self;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_CACHED_PIXBUF, PhotoCachedPixbuf);
@@ -32779,7 +32757,7 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf* obj) {
_g_object_unref0 (self->pixbuf);
#line 303 "/home/jens/Source/shotwell/src/Photo.vala"
_g_timer_destroy0 (self->last_touched);
-#line 32778 "Photo.c"
+#line 32756 "Photo.c"
}
@@ -32798,18 +32776,18 @@ static GType photo_cached_pixbuf_get_type (void) {
static gpointer photo_cached_pixbuf_ref (gpointer instance) {
- PhotoCachedPixbuf* self;
+ PhotoCachedPixbuf * self;
self = instance;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 32803 "Photo.c"
+#line 32781 "Photo.c"
}
static void photo_cached_pixbuf_unref (gpointer instance) {
- PhotoCachedPixbuf* self;
+ PhotoCachedPixbuf * self;
self = instance;
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -32817,7 +32795,7 @@ static void photo_cached_pixbuf_unref (gpointer instance) {
PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self);
#line 300 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 32816 "Photo.c"
+#line 32794 "Photo.c"
}
}
@@ -32828,14 +32806,14 @@ PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_ty
self = (PhotoReimportMasterState*) g_type_create_instance (object_type);
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 32827 "Photo.c"
+#line 32805 "Photo.c"
}
static void photo_value_reimport_master_state_init (GValue* value) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32834 "Photo.c"
+#line 32812 "Photo.c"
}
@@ -32844,7 +32822,7 @@ static void photo_value_reimport_master_state_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_master_state_unref (value->data[0].v_pointer);
-#line 32843 "Photo.c"
+#line 32821 "Photo.c"
}
}
@@ -32854,11 +32832,11 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu
if (src_value->data[0].v_pointer) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer);
-#line 32853 "Photo.c"
+#line 32831 "Photo.c"
} else {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 32857 "Photo.c"
+#line 32835 "Photo.c"
}
}
@@ -32866,66 +32844,66 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu
static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 32865 "Photo.c"
+#line 32843 "Photo.c"
}
static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 32872 "Photo.c"
- PhotoReimportMasterState* object;
+#line 32850 "Photo.c"
+ PhotoReimportMasterState * object;
object = collect_values[0].v_pointer;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32879 "Photo.c"
+#line 32857 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.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 32883 "Photo.c"
+#line 32861 "Photo.c"
}
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32887 "Photo.c"
+#line 32865 "Photo.c"
} else {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32891 "Photo.c"
+#line 32869 "Photo.c"
}
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 32895 "Photo.c"
+#line 32873 "Photo.c"
}
static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoReimportMasterState** object_p;
+ PhotoReimportMasterState ** object_p;
object_p = collect_values[0].v_pointer;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32906 "Photo.c"
+#line 32884 "Photo.c"
}
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 32912 "Photo.c"
+#line 32890 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 32916 "Photo.c"
+#line 32894 "Photo.c"
} else {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32920 "Photo.c"
+#line 32898 "Photo.c"
}
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 32924 "Photo.c"
+#line 32902 "Photo.c"
}
@@ -32939,7 +32917,7 @@ GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gch
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 32938 "Photo.c"
+#line 32916 "Photo.c"
}
@@ -32948,12 +32926,12 @@ gpointer photo_value_get_reimport_master_state (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 32947 "Photo.c"
+#line 32925 "Photo.c"
}
void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
- PhotoReimportMasterState* old;
+ PhotoReimportMasterState * old;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32968,23 +32946,23 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32967 "Photo.c"
+#line 32945 "Photo.c"
} else {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 32971 "Photo.c"
+#line 32949 "Photo.c"
}
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_master_state_unref (old);
-#line 32977 "Photo.c"
+#line 32955 "Photo.c"
}
}
void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
- PhotoReimportMasterState* old;
+ PhotoReimportMasterState * old;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32997,17 +32975,17 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 32996 "Photo.c"
+#line 32974 "Photo.c"
} else {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33000 "Photo.c"
+#line 32978 "Photo.c"
}
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_master_state_unref (old);
-#line 33006 "Photo.c"
+#line 32984 "Photo.c"
}
}
@@ -33017,24 +32995,24 @@ static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClas
photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass);
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize;
-#line 33016 "Photo.c"
+#line 32994 "Photo.c"
}
static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) {
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 33023 "Photo.c"
+#line 33001 "Photo.c"
}
-static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj) {
+static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) {
PhotoReimportMasterState * self;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
g_signal_handlers_destroy (self);
-#line 33033 "Photo.c"
+#line 33011 "Photo.c"
}
@@ -33053,18 +33031,18 @@ GType photo_reimport_master_state_get_type (void) {
gpointer photo_reimport_master_state_ref (gpointer instance) {
- PhotoReimportMasterState* self;
+ PhotoReimportMasterState * self;
self = instance;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 33058 "Photo.c"
+#line 33036 "Photo.c"
}
void photo_reimport_master_state_unref (gpointer instance) {
- PhotoReimportMasterState* self;
+ PhotoReimportMasterState * self;
self = instance;
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -33072,7 +33050,7 @@ void photo_reimport_master_state_unref (gpointer instance) {
PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self);
#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 33071 "Photo.c"
+#line 33049 "Photo.c"
}
}
@@ -33084,30 +33062,30 @@ static gchar** _vala_array_dup28 (gchar** self, int length) {
result = g_new0 (gchar*, length + 1);
#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
for (i = 0; i < length; i++) {
-#line 33083 "Photo.c"
- gchar* _tmp0_ = NULL;
+#line 33061 "Photo.c"
+ gchar* _tmp0_;
#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = g_strdup (self[i]);
#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
result[i] = _tmp0_;
-#line 33089 "Photo.c"
+#line 33067 "Photo.c"
}
#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 33093 "Photo.c"
+#line 33071 "Photo.c"
}
static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
PhotoReimportMasterStateImpl* self = NULL;
- PhotoRow* _tmp0_ = NULL;
- PhotoRow* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
- gchar** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
- gchar** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
+ PhotoRow* _tmp0_;
+ PhotoRow* _tmp1_;
+ PhotoMetadata* _tmp2_;
+ PhotoMetadata* _tmp3_;
+ gchar** _tmp4_;
+ gint _tmp4__length1;
+ gchar** _tmp5_;
+ gint _tmp5__length1;
#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33148,14 +33126,14 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
self->_alterations_size_ = self->alterations_length1;
#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 33147 "Photo.c"
+#line 33125 "Photo.c"
}
static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1);
-#line 33154 "Photo.c"
+#line 33132 "Photo.c"
}
@@ -33164,23 +33142,23 @@ static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStat
photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass);
#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize;
-#line 33163 "Photo.c"
+#line 33141 "Photo.c"
}
static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) {
- PhotoRow* _tmp0_ = NULL;
+ PhotoRow* _tmp0_;
#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo_row_new ();
#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
self->row = _tmp0_;
#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
self->metadata_only = FALSE;
-#line 33175 "Photo.c"
+#line 33153 "Photo.c"
}
-static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj) {
+static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) {
PhotoReimportMasterStateImpl * self;
#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl);
@@ -33192,7 +33170,7 @@ static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState*
self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj);
-#line 33191 "Photo.c"
+#line 33169 "Photo.c"
}
@@ -33214,14 +33192,14 @@ PhotoReimportEditableState* photo_reimport_editable_state_construct (GType objec
self = (PhotoReimportEditableState*) g_type_create_instance (object_type);
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 33213 "Photo.c"
+#line 33191 "Photo.c"
}
static void photo_value_reimport_editable_state_init (GValue* value) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33220 "Photo.c"
+#line 33198 "Photo.c"
}
@@ -33230,7 +33208,7 @@ static void photo_value_reimport_editable_state_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_editable_state_unref (value->data[0].v_pointer);
-#line 33229 "Photo.c"
+#line 33207 "Photo.c"
}
}
@@ -33240,11 +33218,11 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va
if (src_value->data[0].v_pointer) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer);
-#line 33239 "Photo.c"
+#line 33217 "Photo.c"
} else {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 33243 "Photo.c"
+#line 33221 "Photo.c"
}
}
@@ -33252,66 +33230,66 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va
static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 33251 "Photo.c"
+#line 33229 "Photo.c"
}
static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 33258 "Photo.c"
- PhotoReimportEditableState* object;
+#line 33236 "Photo.c"
+ PhotoReimportEditableState * object;
object = collect_values[0].v_pointer;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33265 "Photo.c"
+#line 33243 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.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 33269 "Photo.c"
+#line 33247 "Photo.c"
}
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33273 "Photo.c"
+#line 33251 "Photo.c"
} else {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33277 "Photo.c"
+#line 33255 "Photo.c"
}
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 33281 "Photo.c"
+#line 33259 "Photo.c"
}
static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoReimportEditableState** object_p;
+ PhotoReimportEditableState ** object_p;
object_p = collect_values[0].v_pointer;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33292 "Photo.c"
+#line 33270 "Photo.c"
}
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 33298 "Photo.c"
+#line 33276 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 33302 "Photo.c"
+#line 33280 "Photo.c"
} else {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33306 "Photo.c"
+#line 33284 "Photo.c"
}
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 33310 "Photo.c"
+#line 33288 "Photo.c"
}
@@ -33325,7 +33303,7 @@ GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const g
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 33324 "Photo.c"
+#line 33302 "Photo.c"
}
@@ -33334,12 +33312,12 @@ gpointer photo_value_get_reimport_editable_state (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 33333 "Photo.c"
+#line 33311 "Photo.c"
}
void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) {
- PhotoReimportEditableState* old;
+ PhotoReimportEditableState * old;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33354,23 +33332,23 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object)
value->data[0].v_pointer = v_object;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33353 "Photo.c"
+#line 33331 "Photo.c"
} else {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33357 "Photo.c"
+#line 33335 "Photo.c"
}
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_editable_state_unref (old);
-#line 33363 "Photo.c"
+#line 33341 "Photo.c"
}
}
void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) {
- PhotoReimportEditableState* old;
+ PhotoReimportEditableState * old;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33383,17 +33361,17 @@ void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 33382 "Photo.c"
+#line 33360 "Photo.c"
} else {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33386 "Photo.c"
+#line 33364 "Photo.c"
}
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_editable_state_unref (old);
-#line 33392 "Photo.c"
+#line 33370 "Photo.c"
}
}
@@ -33403,24 +33381,24 @@ static void photo_reimport_editable_state_class_init (PhotoReimportEditableState
photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass);
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize;
-#line 33402 "Photo.c"
+#line 33380 "Photo.c"
}
static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) {
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 33409 "Photo.c"
+#line 33387 "Photo.c"
}
-static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj) {
+static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) {
PhotoReimportEditableState * self;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
g_signal_handlers_destroy (self);
-#line 33419 "Photo.c"
+#line 33397 "Photo.c"
}
@@ -33439,18 +33417,18 @@ GType photo_reimport_editable_state_get_type (void) {
gpointer photo_reimport_editable_state_ref (gpointer instance) {
- PhotoReimportEditableState* self;
+ PhotoReimportEditableState * self;
self = instance;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 33444 "Photo.c"
+#line 33422 "Photo.c"
}
void photo_reimport_editable_state_unref (gpointer instance) {
- PhotoReimportEditableState* self;
+ PhotoReimportEditableState * self;
self = instance;
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -33458,17 +33436,17 @@ void photo_reimport_editable_state_unref (gpointer instance) {
PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self);
#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 33457 "Photo.c"
+#line 33435 "Photo.c"
}
}
static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_construct (GType object_type, BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
PhotoReimportEditableStateImpl* self = NULL;
- BackingPhotoRow* _tmp0_ = NULL;
- BackingPhotoRow* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
+ BackingPhotoRow* _tmp0_;
+ BackingPhotoRow* _tmp1_;
+ PhotoMetadata* _tmp2_;
+ PhotoMetadata* _tmp3_;
#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL);
#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33493,14 +33471,14 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
self->metadata = _tmp3_;
#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 33492 "Photo.c"
+#line 33470 "Photo.c"
}
static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata);
-#line 33499 "Photo.c"
+#line 33477 "Photo.c"
}
@@ -33509,23 +33487,23 @@ static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditable
photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass);
#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize;
-#line 33508 "Photo.c"
+#line 33486 "Photo.c"
}
static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) {
- BackingPhotoRow* _tmp0_ = NULL;
+ BackingPhotoRow* _tmp0_;
#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = backing_photo_row_new ();
#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_state = _tmp0_;
#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
self->metadata_only = FALSE;
-#line 33520 "Photo.c"
+#line 33498 "Photo.c"
}
-static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj) {
+static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) {
PhotoReimportEditableStateImpl * self;
#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl);
@@ -33535,7 +33513,7 @@ static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableSt
_media_metadata_unref0 (self->metadata);
#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj);
-#line 33534 "Photo.c"
+#line 33512 "Photo.c"
}
@@ -33557,14 +33535,14 @@ PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct
self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type);
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 33556 "Photo.c"
+#line 33534 "Photo.c"
}
static void photo_value_reimport_raw_development_state_init (GValue* value) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33563 "Photo.c"
+#line 33541 "Photo.c"
}
@@ -33573,7 +33551,7 @@ static void photo_value_reimport_raw_development_state_free_value (GValue* value
if (value->data[0].v_pointer) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_unref (value->data[0].v_pointer);
-#line 33572 "Photo.c"
+#line 33550 "Photo.c"
}
}
@@ -33583,11 +33561,11 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue*
if (src_value->data[0].v_pointer) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer);
-#line 33582 "Photo.c"
+#line 33560 "Photo.c"
} else {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 33586 "Photo.c"
+#line 33564 "Photo.c"
}
}
@@ -33595,66 +33573,66 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue*
static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 33594 "Photo.c"
+#line 33572 "Photo.c"
}
static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 33601 "Photo.c"
- PhotoReimportRawDevelopmentState* object;
+#line 33579 "Photo.c"
+ PhotoReimportRawDevelopmentState * object;
object = collect_values[0].v_pointer;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33608 "Photo.c"
+#line 33586 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.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 33612 "Photo.c"
+#line 33590 "Photo.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33616 "Photo.c"
+#line 33594 "Photo.c"
} else {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33620 "Photo.c"
+#line 33598 "Photo.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 33624 "Photo.c"
+#line 33602 "Photo.c"
}
static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoReimportRawDevelopmentState** object_p;
+ PhotoReimportRawDevelopmentState ** object_p;
object_p = collect_values[0].v_pointer;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33635 "Photo.c"
+#line 33613 "Photo.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 33641 "Photo.c"
+#line 33619 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 33645 "Photo.c"
+#line 33623 "Photo.c"
} else {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33649 "Photo.c"
+#line 33627 "Photo.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 33653 "Photo.c"
+#line 33631 "Photo.c"
}
@@ -33668,7 +33646,7 @@ GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 33667 "Photo.c"
+#line 33645 "Photo.c"
}
@@ -33677,12 +33655,12 @@ gpointer photo_value_get_reimport_raw_development_state (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 33676 "Photo.c"
+#line 33654 "Photo.c"
}
void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) {
- PhotoReimportRawDevelopmentState* old;
+ PhotoReimportRawDevelopmentState * old;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33697,23 +33675,23 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o
value->data[0].v_pointer = v_object;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33696 "Photo.c"
+#line 33674 "Photo.c"
} else {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33700 "Photo.c"
+#line 33678 "Photo.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_unref (old);
-#line 33706 "Photo.c"
+#line 33684 "Photo.c"
}
}
void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) {
- PhotoReimportRawDevelopmentState* old;
+ PhotoReimportRawDevelopmentState * old;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33726,17 +33704,17 @@ void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 33725 "Photo.c"
+#line 33703 "Photo.c"
} else {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33729 "Photo.c"
+#line 33707 "Photo.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_unref (old);
-#line 33735 "Photo.c"
+#line 33713 "Photo.c"
}
}
@@ -33746,24 +33724,24 @@ static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDev
photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass);
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize;
-#line 33745 "Photo.c"
+#line 33723 "Photo.c"
}
static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) {
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 33752 "Photo.c"
+#line 33730 "Photo.c"
}
-static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj) {
+static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) {
PhotoReimportRawDevelopmentState * self;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState);
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
g_signal_handlers_destroy (self);
-#line 33762 "Photo.c"
+#line 33740 "Photo.c"
}
@@ -33782,18 +33760,18 @@ GType photo_reimport_raw_development_state_get_type (void) {
gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
- PhotoReimportRawDevelopmentState* self;
+ PhotoReimportRawDevelopmentState * self;
self = instance;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 33787 "Photo.c"
+#line 33765 "Photo.c"
}
void photo_reimport_raw_development_state_unref (gpointer instance) {
- PhotoReimportRawDevelopmentState* self;
+ PhotoReimportRawDevelopmentState * self;
self = instance;
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -33801,7 +33779,7 @@ void photo_reimport_raw_development_state_unref (gpointer instance) {
PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self);
#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 33800 "Photo.c"
+#line 33778 "Photo.c"
}
}
@@ -33812,23 +33790,23 @@ static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_stat
self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type);
#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 33811 "Photo.c"
+#line 33789 "Photo.c"
}
static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) {
#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL);
-#line 33818 "Photo.c"
+#line 33796 "Photo.c"
}
static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevelopmentStateImpl* self, BackingPhotoRow* backing, PhotoMetadata* metadata) {
- GeeCollection* _tmp0_ = NULL;
- BackingPhotoRow* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_ = NULL;
- PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_ = NULL;
+ GeeCollection* _tmp0_;
+ BackingPhotoRow* _tmp1_;
+ PhotoMetadata* _tmp2_;
+ PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_;
+ PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_;
#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self));
#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33849,15 +33827,15 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel
gee_collection_add (_tmp0_, _tmp4_);
#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_);
-#line 33848 "Photo.c"
+#line 33826 "Photo.c"
}
static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRawDevelopmentStateImpl* self) {
gint result = 0;
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0);
#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33870,16 +33848,16 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw
result = _tmp2_;
#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 33869 "Photo.c"
+#line 33847 "Photo.c"
}
static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_construct (GType object_type, BackingPhotoRow* backing, PhotoMetadata* metadata) {
PhotoReimportRawDevelopmentStateImplDevToReimport* self = NULL;
- BackingPhotoRow* _tmp0_ = NULL;
- BackingPhotoRow* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
+ BackingPhotoRow* _tmp0_;
+ BackingPhotoRow* _tmp1_;
+ PhotoMetadata* _tmp2_;
+ PhotoMetadata* _tmp3_;
#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL);
#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33904,21 +33882,21 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
self->metadata = _tmp3_;
#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 33903 "Photo.c"
+#line 33881 "Photo.c"
}
static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) {
#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata);
-#line 33910 "Photo.c"
+#line 33888 "Photo.c"
}
static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33917 "Photo.c"
+#line 33895 "Photo.c"
}
@@ -33927,7 +33905,7 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free
if (value->data[0].v_pointer) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer);
-#line 33926 "Photo.c"
+#line 33904 "Photo.c"
}
}
@@ -33937,11 +33915,11 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy
if (src_value->data[0].v_pointer) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer);
-#line 33936 "Photo.c"
+#line 33914 "Photo.c"
} else {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
dest_value->data[0].v_pointer = NULL;
-#line 33940 "Photo.c"
+#line 33918 "Photo.c"
}
}
@@ -33949,66 +33927,66 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy
static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 33948 "Photo.c"
+#line 33926 "Photo.c"
}
static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (collect_values[0].v_pointer) {
-#line 33955 "Photo.c"
- PhotoReimportRawDevelopmentStateImplDevToReimport* object;
+#line 33933 "Photo.c"
+ PhotoReimportRawDevelopmentStateImplDevToReimport * object;
object = collect_values[0].v_pointer;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (object->parent_instance.g_class == NULL) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33962 "Photo.c"
+#line 33940 "Photo.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.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 33966 "Photo.c"
+#line 33944 "Photo.c"
}
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object);
-#line 33970 "Photo.c"
+#line 33948 "Photo.c"
} else {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 33974 "Photo.c"
+#line 33952 "Photo.c"
}
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 33978 "Photo.c"
+#line 33956 "Photo.c"
}
static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- PhotoReimportRawDevelopmentStateImplDevToReimport** object_p;
+ PhotoReimportRawDevelopmentStateImplDevToReimport ** object_p;
object_p = collect_values[0].v_pointer;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (!object_p) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33989 "Photo.c"
+#line 33967 "Photo.c"
}
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (!value->data[0].v_pointer) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = NULL;
-#line 33995 "Photo.c"
+#line 33973 "Photo.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = value->data[0].v_pointer;
-#line 33999 "Photo.c"
+#line 33977 "Photo.c"
} else {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
*object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 34003 "Photo.c"
+#line 33981 "Photo.c"
}
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 34007 "Photo.c"
+#line 33985 "Photo.c"
}
@@ -34022,7 +34000,7 @@ static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_r
G_PARAM_SPEC (spec)->value_type = object_type;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return G_PARAM_SPEC (spec);
-#line 34021 "Photo.c"
+#line 33999 "Photo.c"
}
@@ -34031,12 +34009,12 @@ static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimp
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return value->data[0].v_pointer;
-#line 34030 "Photo.c"
+#line 34008 "Photo.c"
}
static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) {
- PhotoReimportRawDevelopmentStateImplDevToReimport* old;
+ PhotoReimportRawDevelopmentStateImplDevToReimport * old;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34051,23 +34029,23 @@ static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport
value->data[0].v_pointer = v_object;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 34050 "Photo.c"
+#line 34028 "Photo.c"
} else {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 34054 "Photo.c"
+#line 34032 "Photo.c"
}
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 34060 "Photo.c"
+#line 34038 "Photo.c"
}
}
static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) {
- PhotoReimportRawDevelopmentStateImplDevToReimport* old;
+ PhotoReimportRawDevelopmentStateImplDevToReimport * old;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34080,17 +34058,17 @@ static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = v_object;
-#line 34079 "Photo.c"
+#line 34057 "Photo.c"
} else {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
value->data[0].v_pointer = NULL;
-#line 34083 "Photo.c"
+#line 34061 "Photo.c"
}
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (old) {
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 34089 "Photo.c"
+#line 34067 "Photo.c"
}
}
@@ -34100,23 +34078,23 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init
photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass);
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize;
-#line 34099 "Photo.c"
+#line 34077 "Photo.c"
}
static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) {
- BackingPhotoRow* _tmp0_ = NULL;
+ BackingPhotoRow* _tmp0_;
#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = backing_photo_row_new ();
#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing = _tmp0_;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
self->ref_count = 1;
-#line 34111 "Photo.c"
+#line 34089 "Photo.c"
}
-static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj) {
+static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) {
PhotoReimportRawDevelopmentStateImplDevToReimport * self;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport);
@@ -34126,7 +34104,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (
_backing_photo_row_unref0 (self->backing);
#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
_media_metadata_unref0 (self->metadata);
-#line 34125 "Photo.c"
+#line 34103 "Photo.c"
}
@@ -34145,18 +34123,18 @@ GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void)
static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) {
- PhotoReimportRawDevelopmentStateImplDevToReimport* self;
+ PhotoReimportRawDevelopmentStateImplDevToReimport * self;
self = instance;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
g_atomic_int_inc (&self->ref_count);
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
return instance;
-#line 34150 "Photo.c"
+#line 34128 "Photo.c"
}
static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) {
- PhotoReimportRawDevelopmentStateImplDevToReimport* self;
+ PhotoReimportRawDevelopmentStateImplDevToReimport * self;
self = instance;
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -34164,7 +34142,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpo
PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self);
#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 34163 "Photo.c"
+#line 34141 "Photo.c"
}
}
@@ -34174,23 +34152,23 @@ static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportR
photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass);
#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize;
-#line 34173 "Photo.c"
+#line 34151 "Photo.c"
}
static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) {
- GeeArrayList* _tmp0_ = NULL;
+ GeeArrayList* _tmp0_;
#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL);
#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
self->metadata_only = FALSE;
-#line 34185 "Photo.c"
+#line 34163 "Photo.c"
}
-static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj) {
+static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) {
PhotoReimportRawDevelopmentStateImpl * self;
#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl);
@@ -34198,7 +34176,7 @@ static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRaw
_g_object_unref0 (self->list);
#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj);
-#line 34197 "Photo.c"
+#line 34175 "Photo.c"
}
@@ -34220,91 +34198,91 @@ static void photo_class_init (PhotoClass * klass) {
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_class_add_private (klass, sizeof (PhotoPrivate));
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_editable_replaced = (void (*)(Photo*, GFile*, GFile*)) photo_real_notify_editable_replaced;
+ ((PhotoClass *) klass)->notify_editable_replaced = (void (*) (Photo *, GFile*, GFile*)) photo_real_notify_editable_replaced;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_raw_development_modified = (void (*)(Photo*)) photo_real_notify_raw_development_modified;
+ ((PhotoClass *) klass)->notify_raw_development_modified = (void (*) (Photo *)) photo_real_notify_raw_development_modified;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_baseline_replaced = (void (*)(Photo*)) photo_real_notify_baseline_replaced;
+ ((PhotoClass *) klass)->notify_baseline_replaced = (void (*) (Photo *)) photo_real_notify_baseline_replaced;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_master_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_master_reimported;
+ ((PhotoClass *) klass)->notify_master_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_master_reimported;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_editable_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_editable_reimported;
+ ((PhotoClass *) klass)->notify_editable_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_editable_reimported;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_source_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_source_reimported;
+ ((PhotoClass *) klass)->notify_source_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_source_reimported;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_baseline_reimported = (void (*)(Photo*, PhotoMetadata*)) photo_real_notify_baseline_reimported;
+ ((PhotoClass *) klass)->notify_baseline_reimported = (void (*) (Photo *, PhotoMetadata*)) photo_real_notify_baseline_reimported;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) photo_real_internal_delete_backing;
+ ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) photo_real_internal_delete_backing;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) photo_real_get_backing_files_state;
+ ((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*) (MediaSource *, int*)) photo_real_get_backing_files_state;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) photo_real_apply_user_metadata_for_reimport;
+ ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) photo_real_apply_user_metadata_for_reimport;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) photo_real_get_typename;
+ ((DataSourceClass *) klass)->get_typename = (gchar* (*) (DataSource *)) photo_real_get_typename;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) photo_real_get_instance_id;
+ ((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) photo_real_get_instance_id;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->get_source_id = (gchar* (*)(DataSource*)) photo_real_get_source_id;
+ ((DataSourceClass *) klass)->get_source_id = (gchar* (*) (DataSource *)) photo_real_get_source_id;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) photo_real_get_preferred_thumbnail_format;
+ ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) photo_real_get_preferred_thumbnail_format;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_real_create_thumbnail;
+ ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) photo_real_create_thumbnail;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) photo_real_get_file;
+ ((MediaSourceClass *) klass)->get_file = (GFile* (*) (MediaSource *)) photo_real_get_file;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) photo_real_get_master_file;
+ ((MediaSourceClass *) klass)->get_master_file = (GFile* (*) (MediaSource *)) photo_real_get_master_file;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) photo_real_get_timestamp;
+ ((MediaSourceClass *) klass)->get_timestamp = (time_t (*) (MediaSource *)) photo_real_get_timestamp;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) photo_real_get_event_id;
+ ((MediaSourceClass *) klass)->get_event_id = (void (*) (MediaSource *, EventID*)) photo_real_get_event_id;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) photo_real_get_import_id;
+ ((MediaSourceClass *) klass)->get_import_id = (void (*) (MediaSource *, ImportID*)) photo_real_get_import_id;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) photo_real_get_master_md5;
+ ((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*) (MediaSource *)) photo_real_get_master_md5;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) photo_real_get_rating;
+ ((MediaSourceClass *) klass)->get_rating = (Rating (*) (MediaSource *)) photo_real_get_rating;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) photo_real_set_rating;
+ ((MediaSourceClass *) klass)->set_rating = (void (*) (MediaSource *, Rating)) photo_real_set_rating;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) photo_real_increase_rating;
+ ((MediaSourceClass *) klass)->increase_rating = (void (*) (MediaSource *)) photo_real_increase_rating;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) photo_real_decrease_rating;
+ ((MediaSourceClass *) klass)->decrease_rating = (void (*) (MediaSource *)) photo_real_decrease_rating;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->commit_backlinks = (void (*)(DataSource*, SourceCollection*, const gchar*)) photo_real_commit_backlinks;
+ ((DataSourceClass *) klass)->commit_backlinks = (void (*) (DataSource *, SourceCollection*, const gchar*)) photo_real_commit_backlinks;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) photo_real_set_event_id;
+ ((MediaSourceClass *) klass)->set_event_id = (gboolean (*) (MediaSource *, EventID*)) photo_real_set_event_id;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) photo_real_to_string;
+ ((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) photo_real_to_string;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->equals = (gboolean (*)(DataSource*, DataSource*)) photo_real_equals;
+ ((DataSourceClass *) klass)->equals = (gboolean (*) (DataSource *, DataSource*)) photo_real_equals;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) photo_real_get_filesize;
+ ((MediaSourceClass *) klass)->get_filesize = (guint64 (*) (MediaSource *)) photo_real_get_filesize;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) photo_real_get_master_filesize;
+ ((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*) (MediaSource *)) photo_real_get_master_filesize;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) photo_real_get_exposure_time;
+ ((MediaSourceClass *) klass)->get_exposure_time = (time_t (*) (MediaSource *)) photo_real_get_exposure_time;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_basename = (gchar* (*)(MediaSource*)) photo_real_get_basename;
+ ((MediaSourceClass *) klass)->get_basename = (gchar* (*) (MediaSource *)) photo_real_get_basename;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) photo_real_get_title;
+ ((MediaSourceClass *) klass)->get_title = (gchar* (*) (MediaSource *)) photo_real_get_title;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) photo_real_get_comment;
+ ((MediaSourceClass *) klass)->get_comment = (gchar* (*) (MediaSource *)) photo_real_get_comment;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) photo_real_set_title;
+ ((MediaSourceClass *) klass)->set_title = (void (*) (MediaSource *, const gchar*)) photo_real_set_title;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) photo_real_set_comment;
+ ((MediaSourceClass *) klass)->set_comment = (gboolean (*) (MediaSource *, const gchar*)) photo_real_set_comment;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) photo_real_get_dimensions;
+ ((MediaSourceClass *) klass)->get_dimensions = (void (*) (MediaSource *, PhotoException, Dimensions*)) photo_real_get_dimensions;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*)(PhotoSource*)) photo_real_get_metadata;
+ ((PhotoSourceClass *) klass)->get_metadata = (PhotoMetadata* (*) (PhotoSource *)) photo_real_get_metadata;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) photo_real_rotate;
+ ((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) photo_real_rotate;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_real_get_pixbuf;
+ ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) photo_real_get_pixbuf;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) photo_real_has_user_generated_metadata;
+ ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) photo_real_has_user_generated_metadata;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) photo_real_set_user_metadata_for_export;
+ ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) photo_real_set_user_metadata_for_export;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
((PhotoClass *) klass)->editable_replaced = photo_real_editable_replaced;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34326,22 +34304,22 @@ static void photo_class_init (PhotoClass * klass) {
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (klass)->finalize = photo_finalize;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
+ photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL] = g_signal_new ("editable-replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("raw_development_modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL] = g_signal_new ("raw-development-modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("baseline_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_replaced), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL] = g_signal_new ("baseline-replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_replaced), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("master_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+ photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL] = g_signal_new ("master-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("editable_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+ photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL] = g_signal_new ("editable-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("baseline_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+ photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("source_reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
+ photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
#line 326 "/home/jens/Source/shotwell/src/Photo.vala"
g_rec_mutex_init (&__lock_photo_source_pixbuf_cache);
-#line 34340 "Photo.c"
+#line 34318 "Photo.c"
}
@@ -34349,16 +34327,16 @@ static void photo_dateable_interface_init (DateableIface * iface) {
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
photo_dateable_parent_iface = g_type_interface_peek_parent (iface);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->get_exposure_time = (time_t (*)(Dateable*)) photo_real_get_exposure_time;
+ iface->get_exposure_time = (time_t (*) (Dateable *)) photo_real_get_exposure_time;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->set_exposure_time = (void (*)(Dateable*, time_t)) photo_real_set_exposure_time;
-#line 34351 "Photo.c"
+ iface->set_exposure_time = (void (*) (Dateable *, time_t)) photo_real_set_exposure_time;
+#line 34329 "Photo.c"
}
static void photo_instance_init (Photo * self) {
- BackingPhotoRow* _tmp0_ = NULL;
- PhotoBackingReaders* _tmp1_ = NULL;
+ BackingPhotoRow* _tmp0_;
+ PhotoBackingReaders* _tmp1_;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv = PHOTO_GET_PRIVATE (self);
#line 331 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34395,11 +34373,11 @@ static void photo_instance_init (Photo * self) {
self->priv->developments = NULL;
#line 353 "/home/jens/Source/shotwell/src/Photo.vala"
self->backing_photo_row = NULL;
-#line 34394 "Photo.c"
+#line 34372 "Photo.c"
}
-static void photo_finalize (GObject* obj) {
+static void photo_finalize (GObject * obj) {
Photo * self;
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO, Photo);
@@ -34435,7 +34413,7 @@ static void photo_finalize (GObject* obj) {
_backing_photo_row_unref0 (self->backing_photo_row);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (photo_parent_class)->finalize (obj);
-#line 34434 "Photo.c"
+#line 34412 "Photo.c"
}
@@ -34458,13 +34436,13 @@ static void _vala_photo_get_property (GObject * object, guint property_id, GValu
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
switch (property_id) {
-#line 34457 "Photo.c"
+#line 34435 "Photo.c"
default:
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 34463 "Photo.c"
+#line 34441 "Photo.c"
}
}
@@ -34474,13 +34452,13 @@ static void _vala_photo_set_property (GObject * object, guint property_id, const
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
switch (property_id) {
-#line 34473 "Photo.c"
+#line 34451 "Photo.c"
default:
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 161 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 34479 "Photo.c"
+#line 34457 "Photo.c"
}
}
@@ -34502,7 +34480,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
result = file_hash ((GFile*) v);
#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34501 "Photo.c"
+#line 34479 "Photo.c"
}
@@ -34511,7 +34489,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
result = file_equal ((GFile*) a, (GFile*) b);
#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34510 "Photo.c"
+#line 34488 "Photo.c"
}
@@ -34520,7 +34498,7 @@ static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b,
result = int64_compare ((gint64*) a, (gint64*) b);
#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34519 "Photo.c"
+#line 34497 "Photo.c"
}
@@ -34532,7 +34510,7 @@ static gint64* _int64_dup (gint64* self) {
memcpy (dup, self, sizeof (gint64));
#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
return dup;
-#line 34531 "Photo.c"
+#line 34509 "Photo.c"
}
@@ -34541,7 +34519,7 @@ static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer
result = int64_equal ((gint64*) a, (gint64*) b);
#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34540 "Photo.c"
+#line 34518 "Photo.c"
}
@@ -34550,30 +34528,30 @@ static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source,
result = photo_get_photo_key (source);
#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34549 "Photo.c"
+#line 34527 "Photo.c"
}
static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34556 "Photo.c"
+#line 34534 "Photo.c"
}
static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34563 "Photo.c"
+#line 34541 "Photo.c"
}
LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType object_type) {
LibraryPhotoSourceCollection* self = NULL;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- MediaSourceHoldingTank* _tmp2_ = NULL;
- MediaSourceHoldingTank* _tmp3_ = NULL;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ MediaSourceHoldingTank* _tmp2_;
+ MediaSourceHoldingTank* _tmp3_;
#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
self = (LibraryPhotoSourceCollection*) media_source_collection_construct (object_type, "LibraryPhotoSourceCollection", _photo_get_photo_key_get_source_database_key, NULL);
#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34594,14 +34572,14 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o
_source_holding_tank_unref0 (_tmp3_);
#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 34593 "Photo.c"
+#line 34571 "Photo.c"
}
LibraryPhotoSourceCollection* library_photo_source_collection_new (void) {
#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION);
-#line 34600 "Photo.c"
+#line 34578 "Photo.c"
}
@@ -34610,14 +34588,14 @@ static gboolean _library_photo_source_collection_check_if_trashed_photo_source_h
result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34609 "Photo.c"
+#line 34587 "Photo.c"
}
static MediaSourceHoldingTank* library_photo_source_collection_real_create_trashcan (MediaSourceCollection* base) {
LibraryPhotoSourceCollection * self;
MediaSourceHoldingTank* result = NULL;
- LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
+ LibraryPhotoSourceHoldingTank* _tmp0_;
#line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34626,7 +34604,7 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34625 "Photo.c"
+#line 34603 "Photo.c"
}
@@ -34635,14 +34613,14 @@ static gboolean _library_photo_source_collection_check_if_offline_photo_source_h
result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34634 "Photo.c"
+#line 34612 "Photo.c"
}
static MediaSourceHoldingTank* library_photo_source_collection_real_create_offline_bin (MediaSourceCollection* base) {
LibraryPhotoSourceCollection * self;
MediaSourceHoldingTank* result = NULL;
- LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
+ LibraryPhotoSourceHoldingTank* _tmp0_;
#line 4500 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34651,16 +34629,16 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34650 "Photo.c"
+#line 34628 "Photo.c"
}
static MediaMonitor* library_photo_source_collection_real_create_media_monitor (MediaSourceCollection* base, Workers* workers, GCancellable* cancellable) {
LibraryPhotoSourceCollection * self;
MediaMonitor* result = NULL;
- Workers* _tmp0_ = NULL;
- GCancellable* _tmp1_ = NULL;
- PhotoMonitor* _tmp2_ = NULL;
+ Workers* _tmp0_;
+ GCancellable* _tmp1_;
+ PhotoMonitor* _tmp2_;
#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34677,14 +34655,14 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor (
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor);
#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34676 "Photo.c"
+#line 34654 "Photo.c"
}
static gboolean library_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
LibraryPhotoSourceCollection * self;
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34695,14 +34673,14 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO);
#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34694 "Photo.c"
+#line 34672 "Photo.c"
}
static gchar* library_photo_source_collection_real_get_typename (MediaSourceCollection* base) {
LibraryPhotoSourceCollection * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34711,15 +34689,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
result = _tmp0_;
#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34710 "Photo.c"
+#line 34688 "Photo.c"
}
static gboolean library_photo_source_collection_real_is_file_recognized (MediaSourceCollection* base, GFile* file) {
LibraryPhotoSourceCollection * self;
gboolean result = FALSE;
- GFile* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ GFile* _tmp0_;
+ gboolean _tmp1_;
#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34732,30 +34710,30 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo
result = _tmp1_;
#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 34731 "Photo.c"
+#line 34709 "Photo.c"
}
static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file);
-#line 34738 "Photo.c"
+#line 34716 "Photo.c"
}
static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender);
-#line 34745 "Photo.c"
+#line 34723 "Photo.c"
}
static void library_photo_source_collection_real_notify_contents_altered (DataCollection* base, GeeIterable* added, GeeIterable* removed) {
LibraryPhotoSourceCollection * self;
- GeeIterable* _tmp0_ = NULL;
- GeeIterable* _tmp75_ = NULL;
- GeeIterable* _tmp153_ = NULL;
- GeeIterable* _tmp154_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterable* _tmp75_;
+ GeeIterable* _tmp153_;
+ GeeIterable* _tmp154_;
#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34766,11 +34744,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp0_ = added;
#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ != NULL) {
-#line 34765 "Photo.c"
+#line 34743 "Photo.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = added;
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34779,48 +34757,48 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_object_it = _tmp2_;
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 34778 "Photo.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 34756 "Photo.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
LibraryPhoto* photo = NULL;
- DataObject* _tmp7_ = NULL;
- LibraryPhoto* _tmp8_ = NULL;
+ DataObject* _tmp7_;
+ LibraryPhoto* _tmp8_;
GFile* editable = NULL;
- LibraryPhoto* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
- GFile* _tmp11_ = NULL;
- LibraryPhoto* _tmp15_ = NULL;
+ LibraryPhoto* _tmp9_;
+ GFile* _tmp10_;
+ GFile* _tmp11_;
+ LibraryPhoto* _tmp15_;
GeeCollection* raw_list = NULL;
- LibraryPhoto* _tmp16_ = NULL;
- GeeCollection* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
- LibraryPhoto* _tmp28_ = NULL;
+ LibraryPhoto* _tmp16_;
+ GeeCollection* _tmp17_;
+ GeeCollection* _tmp18_;
+ LibraryPhoto* _tmp28_;
gint64 master_filesize = 0LL;
- LibraryPhoto* _tmp29_ = NULL;
- BackingPhotoRow* _tmp30_ = NULL;
- BackingPhotoRow* _tmp31_ = NULL;
- gint64 _tmp32_ = 0LL;
- gint64 _tmp33_ = 0LL;
+ LibraryPhoto* _tmp29_;
+ BackingPhotoRow* _tmp30_;
+ BackingPhotoRow* _tmp31_;
+ gint64 _tmp32_;
+ gint64 _tmp33_;
gint64 _tmp34_ = 0LL;
- LibraryPhoto* _tmp35_ = NULL;
- BackingPhotoRow* _tmp36_ = NULL;
- BackingPhotoRow* _tmp37_ = NULL;
- gboolean _tmp38_ = FALSE;
+ LibraryPhoto* _tmp35_;
+ BackingPhotoRow* _tmp36_;
+ BackingPhotoRow* _tmp37_;
+ gboolean _tmp38_;
gint64 editable_filesize = 0LL;
- GeeMultiMap* _tmp43_ = NULL;
- gint64 _tmp44_ = 0LL;
- LibraryPhoto* _tmp45_ = NULL;
- GeeHashMap* _tmp46_ = NULL;
- LibraryPhoto* _tmp47_ = NULL;
- gint64 _tmp48_ = 0LL;
- gint64 _tmp49_ = 0LL;
+ GeeMultiMap* _tmp43_;
+ gint64 _tmp44_;
+ LibraryPhoto* _tmp45_;
+ GeeHashMap* _tmp46_;
+ LibraryPhoto* _tmp47_;
+ gint64 _tmp48_;
+ gint64 _tmp49_;
GeeCollection* raw_rows = NULL;
- LibraryPhoto* _tmp56_ = NULL;
- GeeCollection* _tmp57_ = NULL;
- GeeCollection* _tmp58_ = NULL;
+ LibraryPhoto* _tmp56_;
+ GeeCollection* _tmp57_;
+ GeeCollection* _tmp58_;
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _object_it;
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34829,7 +34807,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
if (!_tmp4_) {
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 34828 "Photo.c"
+#line 34806 "Photo.c"
}
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _object_it;
@@ -34853,10 +34831,10 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp11_ = editable;
#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_ != NULL) {
-#line 34852 "Photo.c"
- GeeHashMap* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
- LibraryPhoto* _tmp14_ = NULL;
+#line 34830 "Photo.c"
+ GeeHashMap* _tmp12_;
+ GFile* _tmp13_;
+ LibraryPhoto* _tmp14_;
#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = self->priv->by_editable_file;
#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34865,7 +34843,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp14_ = photo;
#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_);
-#line 34864 "Photo.c"
+#line 34842 "Photo.c"
}
#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = photo;
@@ -34881,11 +34859,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp18_ = raw_list;
#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp18_ != NULL) {
-#line 34880 "Photo.c"
+#line 34858 "Photo.c"
{
GeeIterator* _f_it = NULL;
- GeeCollection* _tmp19_ = NULL;
- GeeIterator* _tmp20_ = NULL;
+ GeeCollection* _tmp19_;
+ GeeIterator* _tmp20_;
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = raw_list;
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34894,15 +34872,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_f_it = _tmp20_;
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 34893 "Photo.c"
- GeeIterator* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
+#line 34871 "Photo.c"
+ GeeIterator* _tmp21_;
+ gboolean _tmp22_;
GFile* f = NULL;
- GeeIterator* _tmp23_ = NULL;
- gpointer _tmp24_ = NULL;
- GeeHashMap* _tmp25_ = NULL;
- GFile* _tmp26_ = NULL;
- LibraryPhoto* _tmp27_ = NULL;
+ GeeIterator* _tmp23_;
+ gpointer _tmp24_;
+ GeeHashMap* _tmp25_;
+ GFile* _tmp26_;
+ LibraryPhoto* _tmp27_;
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = _f_it;
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34911,7 +34889,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
if (!_tmp22_) {
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 34910 "Photo.c"
+#line 34888 "Photo.c"
}
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = _f_it;
@@ -34929,11 +34907,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_);
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 34928 "Photo.c"
+#line 34906 "Photo.c"
}
#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 34932 "Photo.c"
+#line 34910 "Photo.c"
}
}
#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34966,11 +34944,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_backing_photo_row_unref0 (_tmp37_);
#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp38_) {
-#line 34965 "Photo.c"
- LibraryPhoto* _tmp39_ = NULL;
- BackingPhotoRow* _tmp40_ = NULL;
- BackingPhotoRow* _tmp41_ = NULL;
- gint64 _tmp42_ = 0LL;
+#line 34943 "Photo.c"
+ LibraryPhoto* _tmp39_;
+ BackingPhotoRow* _tmp40_;
+ BackingPhotoRow* _tmp41_;
+ gint64 _tmp42_;
#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = photo;
#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34983,11 +34961,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp34_ = _tmp42_;
#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp41_);
-#line 34982 "Photo.c"
+#line 34960 "Photo.c"
} else {
#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp34_ = (gint64) -1;
-#line 34986 "Photo.c"
+#line 34964 "Photo.c"
}
#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
editable_filesize = _tmp34_;
@@ -35011,13 +34989,13 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp49_ = editable_filesize;
#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp49_ >= ((gint64) 0)) {
-#line 35010 "Photo.c"
- GeeMultiMap* _tmp50_ = NULL;
- gint64 _tmp51_ = 0LL;
- LibraryPhoto* _tmp52_ = NULL;
- GeeHashMap* _tmp53_ = NULL;
- LibraryPhoto* _tmp54_ = NULL;
- gint64 _tmp55_ = 0LL;
+#line 34988 "Photo.c"
+ GeeMultiMap* _tmp50_;
+ gint64 _tmp51_;
+ LibraryPhoto* _tmp52_;
+ GeeHashMap* _tmp53_;
+ LibraryPhoto* _tmp54_;
+ gint64 _tmp55_;
#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = self->priv->filesize_to_photo;
#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35034,7 +35012,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp55_ = editable_filesize;
#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_);
-#line 35033 "Photo.c"
+#line 35011 "Photo.c"
}
#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp56_ = photo;
@@ -35046,11 +35024,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp58_ = raw_rows;
#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp58_ != NULL) {
-#line 35045 "Photo.c"
+#line 35023 "Photo.c"
{
GeeIterator* _row_it = NULL;
- GeeCollection* _tmp59_ = NULL;
- GeeIterator* _tmp60_ = NULL;
+ GeeCollection* _tmp59_;
+ GeeIterator* _tmp60_;
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp59_ = raw_rows;
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35059,14 +35037,14 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_row_it = _tmp60_;
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35058 "Photo.c"
- GeeIterator* _tmp61_ = NULL;
- gboolean _tmp62_ = FALSE;
+#line 35036 "Photo.c"
+ GeeIterator* _tmp61_;
+ gboolean _tmp62_;
BackingPhotoRow* row = NULL;
- GeeIterator* _tmp63_ = NULL;
- gpointer _tmp64_ = NULL;
- BackingPhotoRow* _tmp65_ = NULL;
- gint64 _tmp66_ = 0LL;
+ GeeIterator* _tmp63_;
+ gpointer _tmp64_;
+ BackingPhotoRow* _tmp65_;
+ gint64 _tmp66_;
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = _row_it;
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35075,7 +35053,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
if (!_tmp62_) {
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35074 "Photo.c"
+#line 35052 "Photo.c"
}
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp63_ = _row_it;
@@ -35089,15 +35067,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp66_ = _tmp65_->filesize;
#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp66_ >= ((gint64) 0)) {
-#line 35088 "Photo.c"
- GeeMultiMap* _tmp67_ = NULL;
- BackingPhotoRow* _tmp68_ = NULL;
- gint64 _tmp69_ = 0LL;
- LibraryPhoto* _tmp70_ = NULL;
- GeeMultiMap* _tmp71_ = NULL;
- LibraryPhoto* _tmp72_ = NULL;
- BackingPhotoRow* _tmp73_ = NULL;
- gint64 _tmp74_ = 0LL;
+#line 35066 "Photo.c"
+ GeeMultiMap* _tmp67_;
+ BackingPhotoRow* _tmp68_;
+ gint64 _tmp69_;
+ LibraryPhoto* _tmp70_;
+ GeeMultiMap* _tmp71_;
+ LibraryPhoto* _tmp72_;
+ BackingPhotoRow* _tmp73_;
+ gint64 _tmp74_;
#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp67_ = self->priv->filesize_to_photo;
#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35118,15 +35096,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp74_ = _tmp73_->filesize;
#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_);
-#line 35117 "Photo.c"
+#line 35095 "Photo.c"
}
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (row);
-#line 35121 "Photo.c"
+#line 35099 "Photo.c"
}
#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_row_it);
-#line 35125 "Photo.c"
+#line 35103 "Photo.c"
}
}
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35139,22 +35117,22 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_g_object_unref0 (photo);
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (object);
-#line 35138 "Photo.c"
+#line 35116 "Photo.c"
}
#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_object_it);
-#line 35142 "Photo.c"
+#line 35120 "Photo.c"
}
}
#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp75_ = removed;
#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp75_ != NULL) {
-#line 35149 "Photo.c"
+#line 35127 "Photo.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp76_ = NULL;
- GeeIterator* _tmp77_ = NULL;
+ GeeIterable* _tmp76_;
+ GeeIterator* _tmp77_;
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp76_ = removed;
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35163,49 +35141,49 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_object_it = _tmp77_;
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35162 "Photo.c"
- GeeIterator* _tmp78_ = NULL;
- gboolean _tmp79_ = FALSE;
+#line 35140 "Photo.c"
+ GeeIterator* _tmp78_;
+ gboolean _tmp79_;
DataObject* object = NULL;
- GeeIterator* _tmp80_ = NULL;
- gpointer _tmp81_ = NULL;
+ GeeIterator* _tmp80_;
+ gpointer _tmp81_;
LibraryPhoto* photo = NULL;
- DataObject* _tmp82_ = NULL;
- LibraryPhoto* _tmp83_ = NULL;
+ DataObject* _tmp82_;
+ LibraryPhoto* _tmp83_;
GFile* editable = NULL;
- LibraryPhoto* _tmp84_ = NULL;
- GFile* _tmp85_ = NULL;
- GFile* _tmp86_ = NULL;
- LibraryPhoto* _tmp94_ = NULL;
- guint _tmp95_ = 0U;
+ LibraryPhoto* _tmp84_;
+ GFile* _tmp85_;
+ GFile* _tmp86_;
+ LibraryPhoto* _tmp94_;
+ guint _tmp95_;
GeeCollection* raw_list = NULL;
- LibraryPhoto* _tmp96_ = NULL;
- GeeCollection* _tmp97_ = NULL;
- GeeCollection* _tmp98_ = NULL;
- LibraryPhoto* _tmp107_ = NULL;
- guint _tmp108_ = 0U;
+ LibraryPhoto* _tmp96_;
+ GeeCollection* _tmp97_;
+ GeeCollection* _tmp98_;
+ LibraryPhoto* _tmp107_;
+ guint _tmp108_;
gint64 master_filesize = 0LL;
- LibraryPhoto* _tmp109_ = NULL;
- BackingPhotoRow* _tmp110_ = NULL;
- BackingPhotoRow* _tmp111_ = NULL;
- gint64 _tmp112_ = 0LL;
- gint64 _tmp113_ = 0LL;
+ LibraryPhoto* _tmp109_;
+ BackingPhotoRow* _tmp110_;
+ BackingPhotoRow* _tmp111_;
+ gint64 _tmp112_;
+ gint64 _tmp113_;
gint64 _tmp114_ = 0LL;
- LibraryPhoto* _tmp115_ = NULL;
- BackingPhotoRow* _tmp116_ = NULL;
- BackingPhotoRow* _tmp117_ = NULL;
- gboolean _tmp118_ = FALSE;
+ LibraryPhoto* _tmp115_;
+ BackingPhotoRow* _tmp116_;
+ BackingPhotoRow* _tmp117_;
+ gboolean _tmp118_;
gint64 editable_filesize = 0LL;
- GeeMultiMap* _tmp123_ = NULL;
- gint64 _tmp124_ = 0LL;
- LibraryPhoto* _tmp125_ = NULL;
- GeeHashMap* _tmp126_ = NULL;
- LibraryPhoto* _tmp127_ = NULL;
- gint64 _tmp128_ = 0LL;
+ GeeMultiMap* _tmp123_;
+ gint64 _tmp124_;
+ LibraryPhoto* _tmp125_;
+ GeeHashMap* _tmp126_;
+ LibraryPhoto* _tmp127_;
+ gint64 _tmp128_;
GeeCollection* raw_rows = NULL;
- LibraryPhoto* _tmp134_ = NULL;
- GeeCollection* _tmp135_ = NULL;
- GeeCollection* _tmp136_ = NULL;
+ LibraryPhoto* _tmp134_;
+ GeeCollection* _tmp135_;
+ GeeCollection* _tmp136_;
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = _object_it;
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35214,7 +35192,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
if (!_tmp79_) {
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35213 "Photo.c"
+#line 35191 "Photo.c"
}
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp80_ = _object_it;
@@ -35238,15 +35216,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp86_ = editable;
#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp86_ != NULL) {
-#line 35237 "Photo.c"
+#line 35215 "Photo.c"
gboolean is_removed = FALSE;
- GeeHashMap* _tmp87_ = NULL;
- LibraryPhoto* _tmp88_ = NULL;
- GFile* _tmp89_ = NULL;
- GFile* _tmp90_ = NULL;
- gboolean _tmp91_ = FALSE;
- gboolean _tmp92_ = FALSE;
- gboolean _tmp93_ = FALSE;
+ GeeHashMap* _tmp87_;
+ LibraryPhoto* _tmp88_;
+ GFile* _tmp89_;
+ GFile* _tmp90_;
+ gboolean _tmp91_;
+ gboolean _tmp92_;
+ gboolean _tmp93_;
#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp87_ = self->priv->by_editable_file;
#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35267,7 +35245,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp93_ = is_removed;
#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_assert (_tmp93_, "is_removed");
-#line 35266 "Photo.c"
+#line 35244 "Photo.c"
}
#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp94_ = photo;
@@ -35285,11 +35263,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp98_ = raw_list;
#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp98_ != NULL) {
-#line 35284 "Photo.c"
+#line 35262 "Photo.c"
{
GeeIterator* _f_it = NULL;
- GeeCollection* _tmp99_ = NULL;
- GeeIterator* _tmp100_ = NULL;
+ GeeCollection* _tmp99_;
+ GeeIterator* _tmp100_;
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp99_ = raw_list;
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35298,14 +35276,14 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_f_it = _tmp100_;
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35297 "Photo.c"
- GeeIterator* _tmp101_ = NULL;
- gboolean _tmp102_ = FALSE;
+#line 35275 "Photo.c"
+ GeeIterator* _tmp101_;
+ gboolean _tmp102_;
GFile* f = NULL;
- GeeIterator* _tmp103_ = NULL;
- gpointer _tmp104_ = NULL;
- GeeHashMap* _tmp105_ = NULL;
- GFile* _tmp106_ = NULL;
+ GeeIterator* _tmp103_;
+ gpointer _tmp104_;
+ GeeHashMap* _tmp105_;
+ GFile* _tmp106_;
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp101_ = _f_it;
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35314,7 +35292,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
if (!_tmp102_) {
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35313 "Photo.c"
+#line 35291 "Photo.c"
}
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp103_ = _f_it;
@@ -35330,11 +35308,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL);
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 35329 "Photo.c"
+#line 35307 "Photo.c"
}
#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 35333 "Photo.c"
+#line 35311 "Photo.c"
}
}
#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35369,11 +35347,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_backing_photo_row_unref0 (_tmp117_);
#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp118_) {
-#line 35368 "Photo.c"
- LibraryPhoto* _tmp119_ = NULL;
- BackingPhotoRow* _tmp120_ = NULL;
- BackingPhotoRow* _tmp121_ = NULL;
- gint64 _tmp122_ = 0LL;
+#line 35346 "Photo.c"
+ LibraryPhoto* _tmp119_;
+ BackingPhotoRow* _tmp120_;
+ BackingPhotoRow* _tmp121_;
+ gint64 _tmp122_;
#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp119_ = photo;
#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35386,11 +35364,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp114_ = _tmp122_;
#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp121_);
-#line 35385 "Photo.c"
+#line 35363 "Photo.c"
} else {
#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp114_ = (gint64) -1;
-#line 35389 "Photo.c"
+#line 35367 "Photo.c"
}
#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
editable_filesize = _tmp114_;
@@ -35412,12 +35390,12 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp128_ = editable_filesize;
#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp128_ >= ((gint64) 0)) {
-#line 35411 "Photo.c"
- GeeMultiMap* _tmp129_ = NULL;
- gint64 _tmp130_ = 0LL;
- LibraryPhoto* _tmp131_ = NULL;
- GeeHashMap* _tmp132_ = NULL;
- LibraryPhoto* _tmp133_ = NULL;
+#line 35389 "Photo.c"
+ GeeMultiMap* _tmp129_;
+ gint64 _tmp130_;
+ LibraryPhoto* _tmp131_;
+ GeeHashMap* _tmp132_;
+ LibraryPhoto* _tmp133_;
#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp129_ = self->priv->filesize_to_photo;
#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35432,7 +35410,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp133_ = photo;
#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL);
-#line 35431 "Photo.c"
+#line 35409 "Photo.c"
}
#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp134_ = photo;
@@ -35444,11 +35422,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp136_ = raw_rows;
#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp136_ != NULL) {
-#line 35443 "Photo.c"
+#line 35421 "Photo.c"
{
GeeIterator* _row_it = NULL;
- GeeCollection* _tmp137_ = NULL;
- GeeIterator* _tmp138_ = NULL;
+ GeeCollection* _tmp137_;
+ GeeIterator* _tmp138_;
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp137_ = raw_rows;
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35457,14 +35435,14 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_row_it = _tmp138_;
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35456 "Photo.c"
- GeeIterator* _tmp139_ = NULL;
- gboolean _tmp140_ = FALSE;
+#line 35434 "Photo.c"
+ GeeIterator* _tmp139_;
+ gboolean _tmp140_;
BackingPhotoRow* row = NULL;
- GeeIterator* _tmp141_ = NULL;
- gpointer _tmp142_ = NULL;
- BackingPhotoRow* _tmp143_ = NULL;
- gint64 _tmp144_ = 0LL;
+ GeeIterator* _tmp141_;
+ gpointer _tmp142_;
+ BackingPhotoRow* _tmp143_;
+ gint64 _tmp144_;
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp139_ = _row_it;
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35473,7 +35451,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
if (!_tmp140_) {
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35472 "Photo.c"
+#line 35450 "Photo.c"
}
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp141_ = _row_it;
@@ -35487,15 +35465,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp144_ = _tmp143_->filesize;
#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp144_ >= ((gint64) 0)) {
-#line 35486 "Photo.c"
- GeeMultiMap* _tmp145_ = NULL;
- BackingPhotoRow* _tmp146_ = NULL;
- gint64 _tmp147_ = 0LL;
- LibraryPhoto* _tmp148_ = NULL;
- GeeMultiMap* _tmp149_ = NULL;
- LibraryPhoto* _tmp150_ = NULL;
- BackingPhotoRow* _tmp151_ = NULL;
- gint64 _tmp152_ = 0LL;
+#line 35464 "Photo.c"
+ GeeMultiMap* _tmp145_;
+ BackingPhotoRow* _tmp146_;
+ gint64 _tmp147_;
+ LibraryPhoto* _tmp148_;
+ GeeMultiMap* _tmp149_;
+ LibraryPhoto* _tmp150_;
+ BackingPhotoRow* _tmp151_;
+ gint64 _tmp152_;
#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp145_ = self->priv->filesize_to_photo;
#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35516,15 +35494,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp152_ = _tmp151_->filesize;
#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_);
-#line 35515 "Photo.c"
+#line 35493 "Photo.c"
}
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (row);
-#line 35519 "Photo.c"
+#line 35497 "Photo.c"
}
#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_row_it);
-#line 35523 "Photo.c"
+#line 35501 "Photo.c"
}
}
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35537,11 +35515,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_g_object_unref0 (photo);
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (object);
-#line 35536 "Photo.c"
+#line 35514 "Photo.c"
}
#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_object_it);
-#line 35540 "Photo.c"
+#line 35518 "Photo.c"
}
}
#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35550,13 +35528,13 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
_tmp154_ = removed;
#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_);
-#line 35549 "Photo.c"
+#line 35527 "Photo.c"
}
static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) {
- GFile* _tmp0_ = NULL;
- GFile* _tmp5_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp5_;
#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35569,12 +35547,12 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
_tmp0_ = old_file;
#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ != NULL) {
-#line 35568 "Photo.c"
+#line 35546 "Photo.c"
gboolean is_removed = FALSE;
- GeeHashMap* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ GeeHashMap* _tmp1_;
+ GFile* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = self->priv->by_editable_file;
#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35587,16 +35565,16 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
_tmp4_ = is_removed;
#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_assert (_tmp4_, "is_removed");
-#line 35586 "Photo.c"
+#line 35564 "Photo.c"
}
#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = new_file;
#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_ != NULL) {
-#line 35592 "Photo.c"
- GeeHashMap* _tmp6_ = NULL;
- GFile* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
+#line 35570 "Photo.c"
+ GeeHashMap* _tmp6_;
+ GFile* _tmp7_;
+ Photo* _tmp8_;
#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->by_editable_file;
#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35605,27 +35583,27 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
_tmp8_ = photo;
#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 35604 "Photo.c"
+#line 35582 "Photo.c"
}
}
static void library_photo_source_collection_on_raw_development_modified (LibraryPhotoSourceCollection* self, Photo* _photo) {
LibraryPhoto* photo = NULL;
- Photo* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
- LibraryPhoto* _tmp2_ = NULL;
- GeeMultiMap* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ Photo* _tmp0_;
+ LibraryPhoto* _tmp1_;
+ LibraryPhoto* _tmp2_;
+ GeeMultiMap* _tmp3_;
+ LibraryPhoto* _tmp4_;
+ gboolean _tmp5_;
GeeCollection* raw_list = NULL;
- LibraryPhoto* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
- GeeCollection* _tmp25_ = NULL;
+ LibraryPhoto* _tmp23_;
+ GeeCollection* _tmp24_;
+ GeeCollection* _tmp25_;
GeeCollection* raw_rows = NULL;
- LibraryPhoto* _tmp35_ = NULL;
- GeeCollection* _tmp36_ = NULL;
- GeeCollection* _tmp37_ = NULL;
+ LibraryPhoto* _tmp35_;
+ GeeCollection* _tmp36_;
+ GeeCollection* _tmp37_;
#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35644,7 +35622,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_g_object_unref0 (photo);
#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 35643 "Photo.c"
+#line 35621 "Photo.c"
}
#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = self->priv->photo_to_raw_development_filesize;
@@ -35654,17 +35632,17 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 35653 "Photo.c"
- GeeMultiMap* _tmp21_ = NULL;
- LibraryPhoto* _tmp22_ = NULL;
+#line 35631 "Photo.c"
+ GeeMultiMap* _tmp21_;
+ LibraryPhoto* _tmp22_;
{
GeeIterator* _s_it = NULL;
- GeeMultiMap* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
+ GeeMultiMap* _tmp6_;
+ LibraryPhoto* _tmp7_;
+ GeeCollection* _tmp8_;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
+ GeeIterator* _tmp11_;
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->photo_to_raw_development_filesize;
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35683,17 +35661,17 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_s_it = _tmp11_;
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35682 "Photo.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 35660 "Photo.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
gint64 s = 0LL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- gint64* _tmp16_ = NULL;
- gint64 _tmp17_ = 0LL;
- GeeMultiMap* _tmp18_ = NULL;
- gint64 _tmp19_ = 0LL;
- LibraryPhoto* _tmp20_ = NULL;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
+ gint64* _tmp16_;
+ gint64 _tmp17_;
+ GeeMultiMap* _tmp18_;
+ gint64 _tmp19_;
+ LibraryPhoto* _tmp20_;
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _s_it;
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35702,7 +35680,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
if (!_tmp13_) {
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35701 "Photo.c"
+#line 35679 "Photo.c"
}
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = _s_it;
@@ -35724,11 +35702,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp20_ = photo;
#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_);
-#line 35723 "Photo.c"
+#line 35701 "Photo.c"
}
#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_s_it);
-#line 35727 "Photo.c"
+#line 35705 "Photo.c"
}
#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = self->priv->photo_to_raw_development_filesize;
@@ -35736,7 +35714,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp22_ = photo;
#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_remove_all (_tmp21_, _tmp22_);
-#line 35735 "Photo.c"
+#line 35713 "Photo.c"
}
#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = photo;
@@ -35748,11 +35726,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp25_ = raw_list;
#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp25_ != NULL) {
-#line 35747 "Photo.c"
+#line 35725 "Photo.c"
{
GeeIterator* _f_it = NULL;
- GeeCollection* _tmp26_ = NULL;
- GeeIterator* _tmp27_ = NULL;
+ GeeCollection* _tmp26_;
+ GeeIterator* _tmp27_;
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = raw_list;
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35761,15 +35739,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_f_it = _tmp27_;
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35760 "Photo.c"
- GeeIterator* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
+#line 35738 "Photo.c"
+ GeeIterator* _tmp28_;
+ gboolean _tmp29_;
GFile* f = NULL;
- GeeIterator* _tmp30_ = NULL;
- gpointer _tmp31_ = NULL;
- GeeHashMap* _tmp32_ = NULL;
- GFile* _tmp33_ = NULL;
- LibraryPhoto* _tmp34_ = NULL;
+ GeeIterator* _tmp30_;
+ gpointer _tmp31_;
+ GeeHashMap* _tmp32_;
+ GFile* _tmp33_;
+ LibraryPhoto* _tmp34_;
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = _f_it;
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35778,7 +35756,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
if (!_tmp29_) {
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35777 "Photo.c"
+#line 35755 "Photo.c"
}
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = _f_it;
@@ -35796,11 +35774,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 35795 "Photo.c"
+#line 35773 "Photo.c"
}
#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 35799 "Photo.c"
+#line 35777 "Photo.c"
}
}
#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35813,11 +35791,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp37_ = raw_rows;
#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp37_ != NULL) {
-#line 35812 "Photo.c"
+#line 35790 "Photo.c"
{
GeeIterator* _row_it = NULL;
- GeeCollection* _tmp38_ = NULL;
- GeeIterator* _tmp39_ = NULL;
+ GeeCollection* _tmp38_;
+ GeeIterator* _tmp39_;
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp38_ = raw_rows;
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35826,14 +35804,14 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_row_it = _tmp39_;
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35825 "Photo.c"
- GeeIterator* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
+#line 35803 "Photo.c"
+ GeeIterator* _tmp40_;
+ gboolean _tmp41_;
BackingPhotoRow* row = NULL;
- GeeIterator* _tmp42_ = NULL;
- gpointer _tmp43_ = NULL;
- BackingPhotoRow* _tmp44_ = NULL;
- gint64 _tmp45_ = 0LL;
+ GeeIterator* _tmp42_;
+ gpointer _tmp43_;
+ BackingPhotoRow* _tmp44_;
+ gint64 _tmp45_;
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = _row_it;
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35842,7 +35820,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
if (!_tmp41_) {
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35841 "Photo.c"
+#line 35819 "Photo.c"
}
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp42_ = _row_it;
@@ -35856,15 +35834,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp45_ = _tmp44_->filesize;
#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp45_ > ((gint64) 0)) {
-#line 35855 "Photo.c"
- GeeMultiMap* _tmp46_ = NULL;
- BackingPhotoRow* _tmp47_ = NULL;
- gint64 _tmp48_ = 0LL;
- LibraryPhoto* _tmp49_ = NULL;
- GeeMultiMap* _tmp50_ = NULL;
- LibraryPhoto* _tmp51_ = NULL;
- BackingPhotoRow* _tmp52_ = NULL;
- gint64 _tmp53_ = 0LL;
+#line 35833 "Photo.c"
+ GeeMultiMap* _tmp46_;
+ BackingPhotoRow* _tmp47_;
+ gint64 _tmp48_;
+ LibraryPhoto* _tmp49_;
+ GeeMultiMap* _tmp50_;
+ LibraryPhoto* _tmp51_;
+ BackingPhotoRow* _tmp52_;
+ gint64 _tmp53_;
#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = self->priv->filesize_to_photo;
#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35885,15 +35863,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_tmp53_ = _tmp52_->filesize;
#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_);
-#line 35884 "Photo.c"
+#line 35862 "Photo.c"
}
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (row);
-#line 35888 "Photo.c"
+#line 35866 "Photo.c"
}
#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_row_it);
-#line 35892 "Photo.c"
+#line 35870 "Photo.c"
}
}
#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35902,33 +35880,33 @@ static void library_photo_source_collection_on_raw_development_modified (Library
_g_object_unref0 (raw_list);
#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 35901 "Photo.c"
+#line 35879 "Photo.c"
}
static gpointer __int64_dup0 (gpointer self) {
#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
return self ? _int64_dup (self) : NULL;
-#line 35908 "Photo.c"
+#line 35886 "Photo.c"
}
static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) {
LibraryPhotoSourceCollection * self;
- GeeMap* _tmp72_ = NULL;
+ GeeMap* _tmp72_;
#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (GEE_IS_MAP (items));
-#line 35919 "Photo.c"
+#line 35897 "Photo.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = items;
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35947,22 +35925,22 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_object_it = _tmp5_;
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 35946 "Photo.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 35924 "Photo.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
Alteration* alteration = NULL;
- GeeMap* _tmp10_ = NULL;
- DataObject* _tmp11_ = NULL;
- gpointer _tmp12_ = NULL;
+ GeeMap* _tmp10_;
+ DataObject* _tmp11_;
+ gpointer _tmp12_;
LibraryPhoto* photo = NULL;
- DataObject* _tmp13_ = NULL;
- LibraryPhoto* _tmp14_ = NULL;
+ DataObject* _tmp13_;
+ LibraryPhoto* _tmp14_;
gboolean _tmp15_ = FALSE;
- Alteration* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
+ Alteration* _tmp16_;
+ gboolean _tmp17_;
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _object_it;
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35971,7 +35949,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
if (!_tmp7_) {
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 35970 "Photo.c"
+#line 35948 "Photo.c"
}
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _object_it;
@@ -36001,57 +35979,57 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
if (_tmp17_) {
#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = TRUE;
-#line 36000 "Photo.c"
+#line 35978 "Photo.c"
} else {
- Alteration* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ Alteration* _tmp18_;
+ gboolean _tmp19_;
#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = alteration;
#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = _tmp19_;
-#line 36010 "Photo.c"
+#line 35988 "Photo.c"
}
#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_) {
-#line 36014 "Photo.c"
+#line 35992 "Photo.c"
gint64 old_master_filesize = 0LL;
- GeeHashMap* _tmp20_ = NULL;
- LibraryPhoto* _tmp21_ = NULL;
- gpointer _tmp22_ = NULL;
- gint64* _tmp23_ = NULL;
- gint64 _tmp24_ = 0LL;
+ GeeHashMap* _tmp20_;
+ LibraryPhoto* _tmp21_;
+ gpointer _tmp22_;
+ gint64* _tmp23_;
+ gint64 _tmp24_;
gint64* _tmp25_ = NULL;
- GeeHashMap* _tmp26_ = NULL;
- LibraryPhoto* _tmp27_ = NULL;
- gboolean _tmp28_ = FALSE;
+ GeeHashMap* _tmp26_;
+ LibraryPhoto* _tmp27_;
+ gboolean _tmp28_;
gint64 old_editable_filesize = 0LL;
- GeeHashMap* _tmp34_ = NULL;
- LibraryPhoto* _tmp35_ = NULL;
- GeeMultiMap* _tmp36_ = NULL;
- gint64 _tmp37_ = 0LL;
- LibraryPhoto* _tmp38_ = NULL;
- gint64 _tmp39_ = 0LL;
+ GeeHashMap* _tmp34_;
+ LibraryPhoto* _tmp35_;
+ GeeMultiMap* _tmp36_;
+ gint64 _tmp37_;
+ LibraryPhoto* _tmp38_;
+ gint64 _tmp39_;
gint64 master_filesize = 0LL;
- LibraryPhoto* _tmp45_ = NULL;
- BackingPhotoRow* _tmp46_ = NULL;
- BackingPhotoRow* _tmp47_ = NULL;
- gint64 _tmp48_ = 0LL;
- gint64 _tmp49_ = 0LL;
+ LibraryPhoto* _tmp45_;
+ BackingPhotoRow* _tmp46_;
+ BackingPhotoRow* _tmp47_;
+ gint64 _tmp48_;
+ gint64 _tmp49_;
gint64 _tmp50_ = 0LL;
- LibraryPhoto* _tmp51_ = NULL;
- BackingPhotoRow* _tmp52_ = NULL;
- BackingPhotoRow* _tmp53_ = NULL;
- gboolean _tmp54_ = FALSE;
+ LibraryPhoto* _tmp51_;
+ BackingPhotoRow* _tmp52_;
+ BackingPhotoRow* _tmp53_;
+ gboolean _tmp54_;
gint64 editable_filesize = 0LL;
- GeeHashMap* _tmp59_ = NULL;
- LibraryPhoto* _tmp60_ = NULL;
- gint64 _tmp61_ = 0LL;
- GeeMultiMap* _tmp62_ = NULL;
- gint64 _tmp63_ = 0LL;
- LibraryPhoto* _tmp64_ = NULL;
- gint64 _tmp65_ = 0LL;
+ GeeHashMap* _tmp59_;
+ LibraryPhoto* _tmp60_;
+ gint64 _tmp61_;
+ GeeMultiMap* _tmp62_;
+ gint64 _tmp63_;
+ LibraryPhoto* _tmp64_;
+ gint64 _tmp65_;
#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = self->priv->photo_to_master_filesize;
#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36074,10 +36052,10 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_);
#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp28_) {
-#line 36073 "Photo.c"
- GeeHashMap* _tmp29_ = NULL;
- LibraryPhoto* _tmp30_ = NULL;
- gpointer _tmp31_ = NULL;
+#line 36051 "Photo.c"
+ GeeHashMap* _tmp29_;
+ LibraryPhoto* _tmp30_;
+ gpointer _tmp31_;
#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = self->priv->photo_to_editable_filesize;
#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36088,10 +36066,10 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_g_free0 (_tmp25_);
#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = (gint64*) _tmp31_;
-#line 36087 "Photo.c"
+#line 36065 "Photo.c"
} else {
- gint64 _tmp32_ = 0LL;
- gint64* _tmp33_ = NULL;
+ gint64 _tmp32_;
+ gint64* _tmp33_;
#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp32_ = (gint64) -1;
#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36100,7 +36078,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_g_free0 (_tmp25_);
#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = _tmp33_;
-#line 36099 "Photo.c"
+#line 36077 "Photo.c"
}
#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
old_editable_filesize = *_tmp25_;
@@ -36122,12 +36100,12 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_tmp39_ = old_editable_filesize;
#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp39_ >= ((gint64) 0)) {
-#line 36121 "Photo.c"
- GeeHashMap* _tmp40_ = NULL;
- LibraryPhoto* _tmp41_ = NULL;
- GeeMultiMap* _tmp42_ = NULL;
- gint64 _tmp43_ = 0LL;
- LibraryPhoto* _tmp44_ = NULL;
+#line 36099 "Photo.c"
+ GeeHashMap* _tmp40_;
+ LibraryPhoto* _tmp41_;
+ GeeMultiMap* _tmp42_;
+ gint64 _tmp43_;
+ LibraryPhoto* _tmp44_;
#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = self->priv->photo_to_editable_filesize;
#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36142,7 +36120,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_tmp44_ = photo;
#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_);
-#line 36141 "Photo.c"
+#line 36119 "Photo.c"
}
#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = photo;
@@ -36170,11 +36148,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_backing_photo_row_unref0 (_tmp53_);
#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp54_) {
-#line 36169 "Photo.c"
- LibraryPhoto* _tmp55_ = NULL;
- BackingPhotoRow* _tmp56_ = NULL;
- BackingPhotoRow* _tmp57_ = NULL;
- gint64 _tmp58_ = 0LL;
+#line 36147 "Photo.c"
+ LibraryPhoto* _tmp55_;
+ BackingPhotoRow* _tmp56_;
+ BackingPhotoRow* _tmp57_;
+ gint64 _tmp58_;
#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = photo;
#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36187,11 +36165,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_tmp50_ = _tmp58_;
#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (_tmp57_);
-#line 36186 "Photo.c"
+#line 36164 "Photo.c"
} else {
#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = (gint64) -1;
-#line 36190 "Photo.c"
+#line 36168 "Photo.c"
}
#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
editable_filesize = _tmp50_;
@@ -36215,13 +36193,13 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_tmp65_ = editable_filesize;
#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp65_ >= ((gint64) 0)) {
-#line 36214 "Photo.c"
- GeeHashMap* _tmp66_ = NULL;
- LibraryPhoto* _tmp67_ = NULL;
- gint64 _tmp68_ = 0LL;
- GeeMultiMap* _tmp69_ = NULL;
- gint64 _tmp70_ = 0LL;
- LibraryPhoto* _tmp71_ = NULL;
+#line 36192 "Photo.c"
+ GeeHashMap* _tmp66_;
+ LibraryPhoto* _tmp67_;
+ gint64 _tmp68_;
+ GeeMultiMap* _tmp69_;
+ gint64 _tmp70_;
+ LibraryPhoto* _tmp71_;
#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp66_ = self->priv->photo_to_editable_filesize;
#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36238,11 +36216,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_tmp71_ = photo;
#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_);
-#line 36237 "Photo.c"
+#line 36215 "Photo.c"
}
#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (_tmp25_);
-#line 36241 "Photo.c"
+#line 36219 "Photo.c"
}
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
@@ -36250,25 +36228,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
_alteration_unref0 (alteration);
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (object);
-#line 36249 "Photo.c"
+#line 36227 "Photo.c"
}
#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_object_it);
-#line 36253 "Photo.c"
+#line 36231 "Photo.c"
}
#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp72_ = items;
#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_);
-#line 36259 "Photo.c"
+#line 36237 "Photo.c"
}
static void library_photo_source_collection_real_postprocess_imported_media (MediaSourceCollection* base, GeeCollection* media_sources) {
LibraryPhotoSourceCollection * self;
GeeHashMultiMap* map = NULL;
- GeeHashMultiMap* _tmp0_ = NULL;
- GeeCollection* _tmp97_ = NULL;
+ GeeHashMultiMap* _tmp0_;
+ GeeCollection* _tmp97_;
#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36277,11 +36255,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
map = _tmp0_;
-#line 36276 "Photo.c"
+#line 36254 "Photo.c"
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = media_sources;
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36290,29 +36268,29 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_media_it = _tmp2_;
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 36289 "Photo.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 36267 "Photo.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
MediaSource* media = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
LibraryPhoto* photo = NULL;
- MediaSource* _tmp7_ = NULL;
- LibraryPhoto* _tmp8_ = NULL;
+ MediaSource* _tmp7_;
+ LibraryPhoto* _tmp8_;
PhotoMetadata* metadata = NULL;
- LibraryPhoto* _tmp9_ = NULL;
- PhotoMetadata* _tmp10_ = NULL;
+ LibraryPhoto* _tmp9_;
+ PhotoMetadata* _tmp10_;
HierarchicalTagIndex* global_index = NULL;
- HierarchicalTagIndex* _tmp11_ = NULL;
+ HierarchicalTagIndex* _tmp11_;
HierarchicalTagIndex* htag_index = NULL;
- PhotoMetadata* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
- LibraryPhoto* _tmp18_ = NULL;
- GeeCollection* _tmp19_ = NULL;
- GeeCollection* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
- PhotoMetadata* _tmp55_ = NULL;
- gboolean _tmp56_ = FALSE;
+ PhotoMetadata* _tmp12_;
+ gboolean _tmp13_;
+ LibraryPhoto* _tmp18_;
+ GeeCollection* _tmp19_;
+ GeeCollection* _tmp20_;
+ gboolean _tmp21_;
+ PhotoMetadata* _tmp55_;
+ gboolean _tmp56_;
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _media_it;
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36321,7 +36299,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
if (!_tmp4_) {
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 36320 "Photo.c"
+#line 36298 "Photo.c"
}
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _media_it;
@@ -36353,11 +36331,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_);
#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp13_) {
-#line 36352 "Photo.c"
- PhotoMetadata* _tmp14_ = NULL;
- GeeSet* _tmp15_ = NULL;
- GeeSet* _tmp16_ = NULL;
- HierarchicalTagIndex* _tmp17_ = NULL;
+#line 36330 "Photo.c"
+ PhotoMetadata* _tmp14_;
+ GeeSet* _tmp15_;
+ GeeSet* _tmp16_;
+ HierarchicalTagIndex* _tmp17_;
#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = metadata;
#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36372,7 +36350,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
htag_index = _tmp17_;
#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp16_);
-#line 36371 "Photo.c"
+#line 36349 "Photo.c"
}
#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = photo;
@@ -36386,14 +36364,14 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_g_object_unref0 (_tmp20_);
#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp21_) {
-#line 36385 "Photo.c"
+#line 36363 "Photo.c"
{
GeeIterator* _keyword_it = NULL;
- LibraryPhoto* _tmp22_ = NULL;
- GeeCollection* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
- GeeIterator* _tmp25_ = NULL;
- GeeIterator* _tmp26_ = NULL;
+ LibraryPhoto* _tmp22_;
+ GeeCollection* _tmp23_;
+ GeeCollection* _tmp24_;
+ GeeIterator* _tmp25_;
+ GeeIterator* _tmp26_;
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = photo;
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36410,21 +36388,21 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_keyword_it = _tmp26_;
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 36409 "Photo.c"
- GeeIterator* _tmp27_ = NULL;
- gboolean _tmp28_ = FALSE;
+#line 36387 "Photo.c"
+ GeeIterator* _tmp27_;
+ gboolean _tmp28_;
gchar* keyword = NULL;
- GeeIterator* _tmp29_ = NULL;
- gpointer _tmp30_ = NULL;
+ GeeIterator* _tmp29_;
+ gpointer _tmp30_;
gboolean _tmp31_ = FALSE;
- HierarchicalTagIndex* _tmp32_ = NULL;
+ HierarchicalTagIndex* _tmp32_;
gchar* name = NULL;
- const gchar* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- HierarchicalTagIndex* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
- gboolean _tmp40_ = FALSE;
- const gchar* _tmp49_ = NULL;
+ const gchar* _tmp36_;
+ gchar* _tmp37_;
+ HierarchicalTagIndex* _tmp38_;
+ const gchar* _tmp39_;
+ gboolean _tmp40_;
+ const gchar* _tmp49_;
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = _keyword_it;
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36433,7 +36411,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
if (!_tmp28_) {
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 36432 "Photo.c"
+#line 36410 "Photo.c"
}
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = _keyword_it;
@@ -36445,10 +36423,10 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp32_ = htag_index;
#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp32_ != NULL) {
-#line 36444 "Photo.c"
- HierarchicalTagIndex* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
+#line 36422 "Photo.c"
+ HierarchicalTagIndex* _tmp33_;
+ const gchar* _tmp34_;
+ gboolean _tmp35_;
#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp33_ = htag_index;
#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36457,11 +36435,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_);
#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = _tmp35_;
-#line 36456 "Photo.c"
+#line 36434 "Photo.c"
} else {
#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = FALSE;
-#line 36460 "Photo.c"
+#line 36438 "Photo.c"
}
#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp31_) {
@@ -36469,7 +36447,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_g_free0 (keyword);
#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
continue;
-#line 36468 "Photo.c"
+#line 36446 "Photo.c"
}
#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = keyword;
@@ -36485,16 +36463,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_);
#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp40_) {
-#line 36484 "Photo.c"
+#line 36462 "Photo.c"
gchar* most_derived_path = NULL;
- HierarchicalTagIndex* _tmp41_ = NULL;
- const gchar* _tmp42_ = NULL;
- gchar* _tmp43_ = NULL;
- GeeHashMultiMap* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
- Tag* _tmp46_ = NULL;
- Tag* _tmp47_ = NULL;
- LibraryPhoto* _tmp48_ = NULL;
+ HierarchicalTagIndex* _tmp41_;
+ const gchar* _tmp42_;
+ gchar* _tmp43_;
+ GeeHashMultiMap* _tmp44_;
+ const gchar* _tmp45_;
+ Tag* _tmp46_;
+ Tag* _tmp47_;
+ LibraryPhoto* _tmp48_;
#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = global_index;
#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36525,18 +36503,18 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_g_free0 (keyword);
#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
continue;
-#line 36524 "Photo.c"
+#line 36502 "Photo.c"
}
#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = name;
#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp49_ != NULL) {
-#line 36530 "Photo.c"
- GeeHashMultiMap* _tmp50_ = NULL;
- const gchar* _tmp51_ = NULL;
- Tag* _tmp52_ = NULL;
- Tag* _tmp53_ = NULL;
- LibraryPhoto* _tmp54_ = NULL;
+#line 36508 "Photo.c"
+ GeeHashMultiMap* _tmp50_;
+ const gchar* _tmp51_;
+ Tag* _tmp52_;
+ Tag* _tmp53_;
+ LibraryPhoto* _tmp54_;
#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = map;
#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36551,17 +36529,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_);
#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp53_);
-#line 36550 "Photo.c"
+#line 36528 "Photo.c"
}
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (name);
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (keyword);
-#line 36556 "Photo.c"
+#line 36534 "Photo.c"
}
#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_keyword_it);
-#line 36560 "Photo.c"
+#line 36538 "Photo.c"
}
}
#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36570,14 +36548,14 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_);
#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp56_) {
-#line 36569 "Photo.c"
+#line 36547 "Photo.c"
{
GeeIterator* _path_it = NULL;
- HierarchicalTagIndex* _tmp57_ = NULL;
- GeeCollection* _tmp58_ = NULL;
- GeeCollection* _tmp59_ = NULL;
- GeeIterator* _tmp60_ = NULL;
- GeeIterator* _tmp61_ = NULL;
+ HierarchicalTagIndex* _tmp57_;
+ GeeCollection* _tmp58_;
+ GeeCollection* _tmp59_;
+ GeeIterator* _tmp60_;
+ GeeIterator* _tmp61_;
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = htag_index;
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36594,16 +36572,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_path_it = _tmp61_;
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 36593 "Photo.c"
- GeeIterator* _tmp62_ = NULL;
- gboolean _tmp63_ = FALSE;
+#line 36571 "Photo.c"
+ GeeIterator* _tmp62_;
+ gboolean _tmp63_;
gchar* path = NULL;
- GeeIterator* _tmp64_ = NULL;
- gpointer _tmp65_ = NULL;
+ GeeIterator* _tmp64_;
+ gpointer _tmp65_;
gchar* name = NULL;
- const gchar* _tmp66_ = NULL;
- gchar* _tmp67_ = NULL;
- const gchar* _tmp68_ = NULL;
+ const gchar* _tmp66_;
+ gchar* _tmp67_;
+ const gchar* _tmp68_;
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp62_ = _path_it;
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36612,7 +36590,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
if (!_tmp63_) {
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 36611 "Photo.c"
+#line 36589 "Photo.c"
}
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp64_ = _path_it;
@@ -36630,12 +36608,12 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tmp68_ = name;
#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp68_ != NULL) {
-#line 36629 "Photo.c"
- GeeHashMultiMap* _tmp69_ = NULL;
- const gchar* _tmp70_ = NULL;
- Tag* _tmp71_ = NULL;
- Tag* _tmp72_ = NULL;
- LibraryPhoto* _tmp73_ = NULL;
+#line 36607 "Photo.c"
+ GeeHashMultiMap* _tmp69_;
+ const gchar* _tmp70_;
+ Tag* _tmp71_;
+ Tag* _tmp72_;
+ LibraryPhoto* _tmp73_;
#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = map;
#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36650,17 +36628,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_);
#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp72_);
-#line 36649 "Photo.c"
+#line 36627 "Photo.c"
}
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (name);
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (path);
-#line 36655 "Photo.c"
+#line 36633 "Photo.c"
}
#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_path_it);
-#line 36659 "Photo.c"
+#line 36637 "Photo.c"
}
}
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36673,16 +36651,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_g_object_unref0 (photo);
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (media);
-#line 36672 "Photo.c"
+#line 36650 "Photo.c"
}
#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_media_it);
-#line 36676 "Photo.c"
+#line 36654 "Photo.c"
}
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp74_ = NULL;
- GeeIterator* _tmp75_ = NULL;
+ GeeCollection* _tmp74_;
+ GeeIterator* _tmp75_;
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp74_ = media_sources;
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36691,16 +36669,16 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_media_it = _tmp75_;
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 36690 "Photo.c"
- GeeIterator* _tmp76_ = NULL;
- gboolean _tmp77_ = FALSE;
+#line 36668 "Photo.c"
+ GeeIterator* _tmp76_;
+ gboolean _tmp77_;
MediaSource* media = NULL;
- GeeIterator* _tmp78_ = NULL;
- gpointer _tmp79_ = NULL;
+ GeeIterator* _tmp78_;
+ gpointer _tmp79_;
LibraryPhoto* photo = NULL;
- MediaSource* _tmp80_ = NULL;
- LibraryPhoto* _tmp81_ = NULL;
- LibraryPhoto* _tmp82_ = NULL;
+ MediaSource* _tmp80_;
+ LibraryPhoto* _tmp81_;
+ LibraryPhoto* _tmp82_;
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp76_ = _media_it;
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36709,7 +36687,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
if (!_tmp77_) {
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 36708 "Photo.c"
+#line 36686 "Photo.c"
}
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp78_ = _media_it;
@@ -36731,19 +36709,19 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_g_object_unref0 (photo);
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (media);
-#line 36730 "Photo.c"
+#line 36708 "Photo.c"
}
#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_media_it);
-#line 36734 "Photo.c"
+#line 36712 "Photo.c"
}
{
GeeIterator* _tag_it = NULL;
- GeeHashMultiMap* _tmp83_ = NULL;
- GeeSet* _tmp84_ = NULL;
- GeeSet* _tmp85_ = NULL;
- GeeIterator* _tmp86_ = NULL;
- GeeIterator* _tmp87_ = NULL;
+ GeeHashMultiMap* _tmp83_;
+ GeeSet* _tmp84_;
+ GeeSet* _tmp85_;
+ GeeIterator* _tmp86_;
+ GeeIterator* _tmp87_;
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp83_ = map;
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36760,17 +36738,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_tag_it = _tmp87_;
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 36759 "Photo.c"
- GeeIterator* _tmp88_ = NULL;
- gboolean _tmp89_ = FALSE;
+#line 36737 "Photo.c"
+ GeeIterator* _tmp88_;
+ gboolean _tmp89_;
Tag* tag = NULL;
- GeeIterator* _tmp90_ = NULL;
- gpointer _tmp91_ = NULL;
- Tag* _tmp92_ = NULL;
- GeeHashMultiMap* _tmp93_ = NULL;
- Tag* _tmp94_ = NULL;
- GeeCollection* _tmp95_ = NULL;
- GeeCollection* _tmp96_ = NULL;
+ GeeIterator* _tmp90_;
+ gpointer _tmp91_;
+ Tag* _tmp92_;
+ GeeHashMultiMap* _tmp93_;
+ Tag* _tmp94_;
+ GeeCollection* _tmp95_;
+ GeeCollection* _tmp96_;
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp88_ = _tag_it;
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36779,7 +36757,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
if (!_tmp89_) {
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 36778 "Photo.c"
+#line 36756 "Photo.c"
}
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp90_ = _tag_it;
@@ -36803,11 +36781,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
_g_object_unref0 (_tmp96_);
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (tag);
-#line 36802 "Photo.c"
+#line 36780 "Photo.c"
}
#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tag_it);
-#line 36806 "Photo.c"
+#line 36784 "Photo.c"
}
#line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp97_ = media_sources;
@@ -36815,13 +36793,13 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_);
#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (map);
-#line 36814 "Photo.c"
+#line 36792 "Photo.c"
}
static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
- LibraryPhoto* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
+ LibraryPhoto* _tmp0_;
+ PhotoMetadata* _tmp1_;
#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36831,8 +36809,8 @@ static void library_photo_source_collection_real_notify_master_reimported (Libra
#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = metadata;
#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_);
-#line 36831 "Photo.c"
+ g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36809 "Photo.c"
}
@@ -36841,13 +36819,13 @@ void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourc
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata);
-#line 36840 "Photo.c"
+#line 36818 "Photo.c"
}
static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
- LibraryPhoto* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
+ LibraryPhoto* _tmp0_;
+ PhotoMetadata* _tmp1_;
#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36857,8 +36835,8 @@ static void library_photo_source_collection_real_notify_editable_reimported (Lib
#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = metadata;
#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_);
-#line 36857 "Photo.c"
+ g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36835 "Photo.c"
}
@@ -36867,13 +36845,13 @@ void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSou
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata);
-#line 36866 "Photo.c"
+#line 36844 "Photo.c"
}
static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
- LibraryPhoto* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
+ LibraryPhoto* _tmp0_;
+ PhotoMetadata* _tmp1_;
#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36883,8 +36861,8 @@ static void library_photo_source_collection_real_notify_source_reimported (Libra
#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = metadata;
#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_);
-#line 36883 "Photo.c"
+ g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36861 "Photo.c"
}
@@ -36893,13 +36871,13 @@ void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourc
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata);
-#line 36892 "Photo.c"
+#line 36870 "Photo.c"
}
static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
- LibraryPhoto* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
+ LibraryPhoto* _tmp0_;
+ PhotoMetadata* _tmp1_;
#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36909,8 +36887,8 @@ static void library_photo_source_collection_real_notify_baseline_reimported (Lib
#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = metadata;
#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_);
-#line 36909 "Photo.c"
+ g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
+#line 36887 "Photo.c"
}
@@ -36919,16 +36897,16 @@ void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSou
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata);
-#line 36918 "Photo.c"
+#line 36896 "Photo.c"
}
static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* base, gint64 numeric_id) {
LibraryPhotoSourceCollection * self;
MediaSource* result = NULL;
- gint64 _tmp0_ = 0LL;
+ gint64 _tmp0_;
PhotoID _tmp1_ = {0};
- LibraryPhoto* _tmp2_ = NULL;
+ LibraryPhoto* _tmp2_;
#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36941,13 +36919,13 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 36940 "Photo.c"
+#line 36918 "Photo.c"
}
static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36960,14 +36938,14 @@ static void library_photo_source_collection_on_trashcan_contents_altered (Librar
_tmp1_ = removed;
#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 36959 "Photo.c"
+#line 36937 "Photo.c"
}
static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) {
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ DataSource* _tmp0_;
+ gboolean _tmp1_;
#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36982,13 +36960,13 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP
result = _tmp1_;
#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 36981 "Photo.c"
+#line 36959 "Photo.c"
}
static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37001,14 +36979,14 @@ static void library_photo_source_collection_on_offline_contents_altered (Library
_tmp1_ = removed;
#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 37000 "Photo.c"
+#line 36978 "Photo.c"
}
static gboolean library_photo_source_collection_check_if_offline_photo (LibraryPhotoSourceCollection* self, DataSource* source, Alteration* alteration) {
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ DataSource* _tmp0_;
+ gboolean _tmp1_;
#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37023,50 +37001,50 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP
result = _tmp1_;
#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37022 "Photo.c"
+#line 37000 "Photo.c"
}
static glong string_strnlen (gchar* str, glong maxlen) {
glong result = 0L;
gchar* end = NULL;
- gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 37045 "Photo.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37023 "Photo.c"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 37053 "Photo.c"
+#line 37031 "Photo.c"
} else {
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 37065 "Photo.c"
+#line 37043 "Photo.c"
}
}
@@ -37075,138 +37053,138 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_ = 0L;
- glong _tmp8_ = 0L;
- glong _tmp14_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp1_;
+ glong _tmp8_;
+ glong _tmp14_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ glong _tmp21_;
+ gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 37089 "Photo.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37067 "Photo.c"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 37095 "Photo.c"
+#line 37073 "Photo.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 37099 "Photo.c"
+#line 37077 "Photo.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 37103 "Photo.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37081 "Photo.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 37115 "Photo.c"
+#line 37093 "Photo.c"
} else {
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 37125 "Photo.c"
+#line 37103 "Photo.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 37131 "Photo.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37109 "Photo.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 37145 "Photo.c"
+#line 37123 "Photo.c"
} else {
- glong _tmp12_ = 0L;
- glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 37155 "Photo.c"
+#line 37133 "Photo.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 37161 "Photo.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37139 "Photo.c"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 37170 "Photo.c"
+#line 37148 "Photo.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 37190 "Photo.c"
+#line 37168 "Photo.c"
}
static MediaSource* library_photo_source_collection_real_fetch_by_source_id (MediaSourceCollection* base, const gchar* source_id) {
LibraryPhotoSourceCollection * self;
MediaSource* result = NULL;
- const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ const gchar* _tmp0_;
+ gboolean _tmp1_;
gchar* numeric_only = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
- gint64 _tmp6_ = 0LL;
- MediaSource* _tmp7_ = NULL;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
+ gint64 _tmp6_;
+ MediaSource* _tmp7_;
#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37237,18 +37215,18 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med
_g_free0 (numeric_only);
#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37236 "Photo.c"
+#line 37214 "Photo.c"
}
static GeeCollection* library_photo_source_collection_real_get_event_source_ids (MediaSourceCollection* base, EventID* event_id) {
LibraryPhotoSourceCollection * self;
GeeCollection* result = NULL;
- PhotoTable* _tmp0_ = NULL;
- PhotoTable* _tmp1_ = NULL;
- EventID _tmp2_ = {0};
- GeeArrayList* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
+ PhotoTable* _tmp0_;
+ PhotoTable* _tmp1_;
+ EventID _tmp2_;
+ GeeArrayList* _tmp3_;
+ GeeCollection* _tmp4_;
#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37269,15 +37247,15 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids
result = _tmp4_;
#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37268 "Photo.c"
+#line 37246 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id) {
LibraryPhoto* result = NULL;
- PhotoID _tmp0_ = {0};
- gint64 _tmp1_ = 0LL;
- DataSource* _tmp2_ = NULL;
+ PhotoID _tmp0_;
+ gint64 _tmp1_;
+ DataSource* _tmp2_;
#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37292,15 +37270,15 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37291 "Photo.c"
+#line 37269 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPhotoSourceCollection* self, GFile* file) {
LibraryPhoto* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ GFile* _tmp1_;
+ gpointer _tmp2_;
#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37315,15 +37293,15 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho
result = (LibraryPhoto*) _tmp2_;
#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37314 "Photo.c"
+#line 37292 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (LibraryPhotoSourceCollection* self, GFile* file) {
LibraryPhoto* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ GFile* _tmp1_;
+ gpointer _tmp2_;
#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37338,26 +37316,26 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib
result = (LibraryPhoto*) _tmp2_;
#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37337 "Photo.c"
+#line 37315 "Photo.c"
}
static void library_photo_source_collection_compare_backing (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matches_development) {
- LibraryPhoto* _tmp0_ = NULL;
- BackingPhotoRow* _tmp1_ = NULL;
- BackingPhotoRow* _tmp2_ = NULL;
- GFileInfo* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ LibraryPhoto* _tmp0_;
+ BackingPhotoRow* _tmp1_;
+ BackingPhotoRow* _tmp2_;
+ GFileInfo* _tmp3_;
+ gboolean _tmp4_;
+ gboolean _tmp5_;
BackingPhotoRow* editable = NULL;
- LibraryPhoto* _tmp8_ = NULL;
- BackingPhotoRow* _tmp9_ = NULL;
+ LibraryPhoto* _tmp8_;
+ BackingPhotoRow* _tmp9_;
gboolean _tmp10_ = FALSE;
- BackingPhotoRow* _tmp11_ = NULL;
+ BackingPhotoRow* _tmp11_;
GeeCollection* development = NULL;
- LibraryPhoto* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
- GeeCollection* _tmp19_ = NULL;
+ LibraryPhoto* _tmp17_;
+ GeeCollection* _tmp18_;
+ GeeCollection* _tmp19_;
#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37386,16 +37364,16 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_backing_photo_row_unref0 (_tmp2_);
#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 37385 "Photo.c"
- GeeCollection* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
+#line 37363 "Photo.c"
+ GeeCollection* _tmp6_;
+ LibraryPhoto* _tmp7_;
#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = matches_master;
#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = photo;
#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
gee_collection_add (_tmp6_, _tmp7_);
-#line 37394 "Photo.c"
+#line 37372 "Photo.c"
}
#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo;
@@ -37407,10 +37385,10 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_tmp11_ = editable;
#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp11_ != NULL) {
-#line 37406 "Photo.c"
- BackingPhotoRow* _tmp12_ = NULL;
- GFileInfo* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+#line 37384 "Photo.c"
+ BackingPhotoRow* _tmp12_;
+ GFileInfo* _tmp13_;
+ gboolean _tmp14_;
#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = editable;
#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37419,24 +37397,24 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_);
#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = _tmp14_;
-#line 37418 "Photo.c"
+#line 37396 "Photo.c"
} else {
#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = FALSE;
-#line 37422 "Photo.c"
+#line 37400 "Photo.c"
}
#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp10_) {
-#line 37426 "Photo.c"
- GeeCollection* _tmp15_ = NULL;
- LibraryPhoto* _tmp16_ = NULL;
+#line 37404 "Photo.c"
+ GeeCollection* _tmp15_;
+ LibraryPhoto* _tmp16_;
#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = matches_editable;
#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = photo;
#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
gee_collection_add (_tmp15_, _tmp16_);
-#line 37435 "Photo.c"
+#line 37413 "Photo.c"
}
#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = photo;
@@ -37448,11 +37426,11 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_tmp19_ = development;
#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp19_ != NULL) {
-#line 37447 "Photo.c"
+#line 37425 "Photo.c"
{
GeeIterator* _row_it = NULL;
- GeeCollection* _tmp20_ = NULL;
- GeeIterator* _tmp21_ = NULL;
+ GeeCollection* _tmp20_;
+ GeeIterator* _tmp21_;
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = development;
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37461,15 +37439,15 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_row_it = _tmp21_;
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 37460 "Photo.c"
- GeeIterator* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
+#line 37438 "Photo.c"
+ GeeIterator* _tmp22_;
+ gboolean _tmp23_;
BackingPhotoRow* row = NULL;
- GeeIterator* _tmp24_ = NULL;
- gpointer _tmp25_ = NULL;
- BackingPhotoRow* _tmp26_ = NULL;
- GFileInfo* _tmp27_ = NULL;
- gboolean _tmp28_ = FALSE;
+ GeeIterator* _tmp24_;
+ gpointer _tmp25_;
+ BackingPhotoRow* _tmp26_;
+ GFileInfo* _tmp27_;
+ gboolean _tmp28_;
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = _row_it;
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37478,7 +37456,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
if (!_tmp23_) {
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 37477 "Photo.c"
+#line 37455 "Photo.c"
}
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = _row_it;
@@ -37494,9 +37472,9 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_);
#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp28_) {
-#line 37493 "Photo.c"
- GeeCollection* _tmp29_ = NULL;
- LibraryPhoto* _tmp30_ = NULL;
+#line 37471 "Photo.c"
+ GeeCollection* _tmp29_;
+ LibraryPhoto* _tmp30_;
#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = matches_development;
#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37507,22 +37485,22 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
_backing_photo_row_unref0 (row);
#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 37506 "Photo.c"
+#line 37484 "Photo.c"
}
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (row);
-#line 37510 "Photo.c"
+#line 37488 "Photo.c"
}
#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_row_it);
-#line 37514 "Photo.c"
+#line 37492 "Photo.c"
}
}
#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (development);
#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (editable);
-#line 37521 "Photo.c"
+#line 37499 "Photo.c"
}
@@ -37537,16 +37515,16 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (GEE_IS_COLLECTION (matched_development));
-#line 37536 "Photo.c"
+#line 37514 "Photo.c"
{
GeeIterator* _photo_it = NULL;
- GeeMultiMap* _tmp0_ = NULL;
- GFileInfo* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
- GeeCollection* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
+ GeeMultiMap* _tmp0_;
+ GFileInfo* _tmp1_;
+ gint64 _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeIterator* _tmp5_;
+ GeeIterator* _tmp6_;
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->filesize_to_photo;
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37567,17 +37545,17 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
_photo_it = _tmp6_;
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 37566 "Photo.c"
- GeeIterator* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 37544 "Photo.c"
+ GeeIterator* _tmp7_;
+ gboolean _tmp8_;
LibraryPhoto* photo = NULL;
- GeeIterator* _tmp9_ = NULL;
- gpointer _tmp10_ = NULL;
- LibraryPhoto* _tmp11_ = NULL;
- GFileInfo* _tmp12_ = NULL;
- GeeCollection* _tmp13_ = NULL;
- GeeCollection* _tmp14_ = NULL;
- GeeCollection* _tmp15_ = NULL;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
+ LibraryPhoto* _tmp11_;
+ GFileInfo* _tmp12_;
+ GeeCollection* _tmp13_;
+ GeeCollection* _tmp14_;
+ GeeCollection* _tmp15_;
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = _photo_it;
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37586,7 +37564,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
if (!_tmp8_) {
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 37585 "Photo.c"
+#line 37563 "Photo.c"
}
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = _photo_it;
@@ -37608,18 +37586,18 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 37607 "Photo.c"
+#line 37585 "Photo.c"
}
#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_photo_it);
-#line 37611 "Photo.c"
+#line 37589 "Photo.c"
}
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp16_ = NULL;
- GeeCollection* _tmp17_ = NULL;
- GeeIterator* _tmp18_ = NULL;
- GeeIterator* _tmp19_ = NULL;
+ GeeCollection* _tmp16_;
+ GeeCollection* _tmp17_;
+ GeeIterator* _tmp18_;
+ GeeIterator* _tmp19_;
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37634,17 +37612,17 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
_media_it = _tmp19_;
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 37633 "Photo.c"
- GeeIterator* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+#line 37611 "Photo.c"
+ GeeIterator* _tmp20_;
+ gboolean _tmp21_;
MediaSource* media = NULL;
- GeeIterator* _tmp22_ = NULL;
- gpointer _tmp23_ = NULL;
- MediaSource* _tmp24_ = NULL;
- GFileInfo* _tmp25_ = NULL;
- GeeCollection* _tmp26_ = NULL;
- GeeCollection* _tmp27_ = NULL;
- GeeCollection* _tmp28_ = NULL;
+ GeeIterator* _tmp22_;
+ gpointer _tmp23_;
+ MediaSource* _tmp24_;
+ GFileInfo* _tmp25_;
+ GeeCollection* _tmp26_;
+ GeeCollection* _tmp27_;
+ GeeCollection* _tmp28_;
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = _media_it;
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37653,7 +37631,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
if (!_tmp21_) {
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 37652 "Photo.c"
+#line 37630 "Photo.c"
}
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = _media_it;
@@ -37675,11 +37653,11 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_);
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (media);
-#line 37674 "Photo.c"
+#line 37652 "Photo.c"
}
#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_media_it);
-#line 37678 "Photo.c"
+#line 37656 "Photo.c"
}
}
@@ -37690,15 +37668,15 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (basename != NULL);
-#line 37689 "Photo.c"
+#line 37667 "Photo.c"
{
GeeIterator* _photo_it = NULL;
- GeeMultiMap* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeMultiMap* _tmp0_;
+ gint64 _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->filesize_to_photo;
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37717,19 +37695,19 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
_photo_it = _tmp5_;
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 37716 "Photo.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 37694 "Photo.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
LibraryPhoto* photo = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- LibraryPhoto* _tmp10_ = NULL;
- GFile* _tmp11_ = NULL;
- GFile* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- gint _tmp15_ = 0;
- gboolean _tmp16_ = FALSE;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ LibraryPhoto* _tmp10_;
+ GFile* _tmp11_;
+ GFile* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
+ gint _tmp15_;
+ gboolean _tmp16_;
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _photo_it;
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37738,7 +37716,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
if (!_tmp7_) {
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 37737 "Photo.c"
+#line 37715 "Photo.c"
}
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = _photo_it;
@@ -37764,8 +37742,8 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
_g_object_unref0 (_tmp12_);
#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp16_) {
-#line 37763 "Photo.c"
- LibraryPhoto* _tmp17_ = NULL;
+#line 37741 "Photo.c"
+ LibraryPhoto* _tmp17_;
PhotoID _tmp18_ = {0};
#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = photo;
@@ -37779,15 +37757,15 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
_g_object_unref0 (_photo_it);
#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 37778 "Photo.c"
+#line 37756 "Photo.c"
}
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 37782 "Photo.c"
+#line 37760 "Photo.c"
}
#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_photo_it);
-#line 37786 "Photo.c"
+#line 37764 "Photo.c"
}
#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
@@ -37795,16 +37773,16 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
*result = _tmp19_;
#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 37794 "Photo.c"
+#line 37772 "Photo.c"
}
gboolean library_photo_source_collection_has_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- gint64 _tmp1_ = 0LL;
+ const gchar* _tmp0_;
+ gint64 _tmp1_;
PhotoID _tmp2_ = {0};
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37821,19 +37799,19 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
result = _tmp3_;
#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37820 "Photo.c"
+#line 37798 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file) {
LibraryPhoto* result = NULL;
LibraryPhoto* photo = NULL;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
- LibraryPhoto* _tmp5_ = NULL;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ GFile* _tmp2_;
+ MediaSource* _tmp3_;
+ LibraryPhoto* _tmp4_;
+ LibraryPhoto* _tmp5_;
#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37856,11 +37834,11 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
_tmp5_ = photo;
#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_ == NULL) {
-#line 37855 "Photo.c"
- MediaSourceHoldingTank* _tmp6_ = NULL;
- LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
- GFile* _tmp8_ = NULL;
- LibraryPhoto* _tmp9_ = NULL;
+#line 37833 "Photo.c"
+ MediaSourceHoldingTank* _tmp6_;
+ LibraryPhotoSourceHoldingTank* _tmp7_;
+ GFile* _tmp8_;
+ LibraryPhoto* _tmp9_;
#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37875,23 +37853,23 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
_source_holding_tank_unref0 (_tmp7_);
-#line 37874 "Photo.c"
+#line 37852 "Photo.c"
}
#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
result = photo;
#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37880 "Photo.c"
+#line 37858 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) {
LibraryPhoto* result = NULL;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ const gchar* _tmp2_;
+ MediaSource* _tmp3_;
+ LibraryPhoto* _tmp4_;
#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37912,19 +37890,19 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
result = _tmp4_;
#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37911 "Photo.c"
+#line 37889 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file) {
LibraryPhoto* result = NULL;
LibraryPhoto* photo = NULL;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
- LibraryPhoto* _tmp5_ = NULL;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ GFile* _tmp2_;
+ MediaSource* _tmp3_;
+ LibraryPhoto* _tmp4_;
+ LibraryPhoto* _tmp5_;
#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37947,11 +37925,11 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
_tmp5_ = photo;
#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_ == NULL) {
-#line 37946 "Photo.c"
- MediaSourceHoldingTank* _tmp6_ = NULL;
- LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
- GFile* _tmp8_ = NULL;
- LibraryPhoto* _tmp9_ = NULL;
+#line 37924 "Photo.c"
+ MediaSourceHoldingTank* _tmp6_;
+ LibraryPhotoSourceHoldingTank* _tmp7_;
+ GFile* _tmp8_;
+ LibraryPhoto* _tmp9_;
#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37966,23 +37944,23 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
_source_holding_tank_unref0 (_tmp7_);
-#line 37965 "Photo.c"
+#line 37943 "Photo.c"
}
#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
result = photo;
#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 37971 "Photo.c"
+#line 37949 "Photo.c"
}
LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5) {
LibraryPhoto* result = NULL;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ const gchar* _tmp2_;
+ MediaSource* _tmp3_;
+ LibraryPhoto* _tmp4_;
#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38003,16 +37981,16 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
result = _tmp4_;
#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38002 "Photo.c"
+#line 37980 "Photo.c"
}
gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollection* self) {
gint result = 0;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
#line 4876 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0);
#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38029,7 +38007,7 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
result = _tmp3_;
#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38028 "Photo.c"
+#line 38006 "Photo.c"
}
@@ -38037,23 +38015,23 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
LibraryPhotoSourceCollectionState _vala_state = 0;
LibraryPhoto* result = NULL;
LibraryPhoto* photo = NULL;
- GFile* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
- LibraryPhoto* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
- LibraryPhoto* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
- LibraryPhoto* _tmp8_ = NULL;
- GFile* _tmp9_ = NULL;
- LibraryPhoto* _tmp10_ = NULL;
- LibraryPhoto* _tmp11_ = NULL;
- LibraryPhoto* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
- LibraryPhoto* _tmp14_ = NULL;
- LibraryPhoto* _tmp15_ = NULL;
- LibraryPhoto* _tmp16_ = NULL;
+ GFile* _tmp0_;
+ MediaSource* _tmp1_;
+ LibraryPhoto* _tmp2_;
+ GFile* _tmp3_;
+ LibraryPhoto* _tmp4_;
+ LibraryPhoto* _tmp5_;
+ GFile* _tmp6_;
+ LibraryPhoto* _tmp7_;
+ LibraryPhoto* _tmp8_;
+ GFile* _tmp9_;
+ LibraryPhoto* _tmp10_;
+ LibraryPhoto* _tmp11_;
+ LibraryPhoto* _tmp12_;
+ GFile* _tmp13_;
+ LibraryPhoto* _tmp14_;
+ LibraryPhoto* _tmp15_;
+ LibraryPhoto* _tmp16_;
#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38076,11 +38054,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (state) {
#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 38075 "Photo.c"
+#line 38053 "Photo.c"
}
#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38079 "Photo.c"
+#line 38057 "Photo.c"
}
#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = file;
@@ -38102,11 +38080,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (state) {
#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 38101 "Photo.c"
+#line 38079 "Photo.c"
}
#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38105 "Photo.c"
+#line 38083 "Photo.c"
}
#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = file;
@@ -38128,11 +38106,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (state) {
#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 38127 "Photo.c"
+#line 38105 "Photo.c"
}
#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38131 "Photo.c"
+#line 38109 "Photo.c"
}
#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = file;
@@ -38144,7 +38122,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (_tmp11_ == NULL) {
#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp10_);
-#line 38143 "Photo.c"
+#line 38121 "Photo.c"
}
#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
@@ -38162,11 +38140,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (state) {
#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 38161 "Photo.c"
+#line 38139 "Photo.c"
}
#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38165 "Photo.c"
+#line 38143 "Photo.c"
}
#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = file;
@@ -38178,7 +38156,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (_tmp15_ == NULL) {
#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp14_);
-#line 38177 "Photo.c"
+#line 38155 "Photo.c"
}
#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
@@ -38196,11 +38174,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (state) {
#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 38195 "Photo.c"
+#line 38173 "Photo.c"
}
#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38199 "Photo.c"
+#line 38177 "Photo.c"
}
#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
@@ -38212,29 +38190,29 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
if (state) {
#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
*state = _vala_state;
-#line 38211 "Photo.c"
+#line 38189 "Photo.c"
}
#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38215 "Photo.c"
+#line 38193 "Photo.c"
}
static gboolean library_photo_source_collection_real_has_backlink (SourceCollection* base, SourceBacklink* backlink) {
LibraryPhotoSourceCollection * self;
gboolean result = FALSE;
- SourceBacklink* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- MediaSourceHoldingTank* _tmp2_ = NULL;
- MediaSourceHoldingTank* _tmp3_ = NULL;
- SourceBacklink* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
- MediaSourceHoldingTank* _tmp7_ = NULL;
- MediaSourceHoldingTank* _tmp8_ = NULL;
- SourceBacklink* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- gboolean _tmp11_ = FALSE;
+ SourceBacklink* _tmp0_;
+ gboolean _tmp1_;
+ MediaSourceHoldingTank* _tmp2_;
+ MediaSourceHoldingTank* _tmp3_;
+ SourceBacklink* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
+ MediaSourceHoldingTank* _tmp7_;
+ MediaSourceHoldingTank* _tmp8_;
+ SourceBacklink* _tmp9_;
+ gboolean _tmp10_;
+ gboolean _tmp11_;
#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38249,7 +38227,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
result = TRUE;
#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38248 "Photo.c"
+#line 38226 "Photo.c"
}
#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -38269,7 +38247,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
result = TRUE;
#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38268 "Photo.c"
+#line 38246 "Photo.c"
}
#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -38289,25 +38267,25 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
result = TRUE;
#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38288 "Photo.c"
+#line 38266 "Photo.c"
}
#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
result = FALSE;
#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38294 "Photo.c"
+#line 38272 "Photo.c"
}
static void library_photo_source_collection_real_remove_backlink (SourceCollection* base, SourceBacklink* backlink) {
LibraryPhotoSourceCollection * self;
- MediaSourceHoldingTank* _tmp0_ = NULL;
- MediaSourceHoldingTank* _tmp1_ = NULL;
- SourceBacklink* _tmp2_ = NULL;
- MediaSourceHoldingTank* _tmp3_ = NULL;
- MediaSourceHoldingTank* _tmp4_ = NULL;
- SourceBacklink* _tmp5_ = NULL;
- SourceBacklink* _tmp6_ = NULL;
+ MediaSourceHoldingTank* _tmp0_;
+ MediaSourceHoldingTank* _tmp1_;
+ SourceBacklink* _tmp2_;
+ MediaSourceHoldingTank* _tmp3_;
+ MediaSourceHoldingTank* _tmp4_;
+ SourceBacklink* _tmp5_;
+ SourceBacklink* _tmp6_;
#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38336,30 +38314,30 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti
_tmp6_ = backlink;
#line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38335 "Photo.c"
+#line 38313 "Photo.c"
}
static TransactionController* library_photo_source_collection_real_get_transaction_controller (MediaSourceCollection* base) {
TransactionController* result;
LibraryPhotoSourceCollection* self;
- TransactionController* _tmp0_ = NULL;
- TransactionController* _tmp2_ = NULL;
+ TransactionController* _tmp0_;
+ TransactionController* _tmp2_;
#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = self->priv->_transaction_controller;
#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ == NULL) {
-#line 38350 "Photo.c"
- MediaSourceTransactionController* _tmp1_ = NULL;
+#line 38328 "Photo.c"
+ MediaSourceTransactionController* _tmp1_;
#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
_transaction_controller_unref0 (self->priv->_transaction_controller);
#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 38358 "Photo.c"
+#line 38336 "Photo.c"
}
#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = self->priv->_transaction_controller;
@@ -38367,7 +38345,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
result = _tmp2_;
#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 38366 "Photo.c"
+#line 38344 "Photo.c"
}
@@ -38376,7 +38354,7 @@ static void library_photo_source_collection_real_master_reimported (LibraryPhoto
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38375 "Photo.c"
+#line 38353 "Photo.c"
}
@@ -38395,19 +38373,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
data1 = closure->data;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
data2 = param_values->data[0].v_pointer;
-#line 38394 "Photo.c"
+#line 38372 "Photo.c"
} else {
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
data1 = param_values->data[0].v_pointer;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
data2 = closure->data;
-#line 38400 "Photo.c"
+#line 38378 "Photo.c"
}
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2);
-#line 38406 "Photo.c"
+#line 38384 "Photo.c"
}
@@ -38416,7 +38394,7 @@ static void library_photo_source_collection_real_editable_reimported (LibraryPho
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38415 "Photo.c"
+#line 38393 "Photo.c"
}
@@ -38425,7 +38403,7 @@ static void library_photo_source_collection_real_baseline_reimported (LibraryPho
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38424 "Photo.c"
+#line 38402 "Photo.c"
}
@@ -38434,7 +38412,7 @@ static void library_photo_source_collection_real_source_reimported (LibraryPhoto
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38433 "Photo.c"
+#line 38411 "Photo.c"
}
@@ -38446,41 +38424,41 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate));
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) library_photo_source_collection_real_create_trashcan;
+ ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_trashcan;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) library_photo_source_collection_real_create_offline_bin;
+ ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_offline_bin;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor;
+ ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) library_photo_source_collection_real_holds_type_of_source;
+ ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) library_photo_source_collection_real_holds_type_of_source;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) library_photo_source_collection_real_get_typename;
+ ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) library_photo_source_collection_real_get_typename;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) library_photo_source_collection_real_is_file_recognized;
+ ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) library_photo_source_collection_real_is_file_recognized;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered;
+ ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) library_photo_source_collection_real_items_altered;
+ ((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) library_photo_source_collection_real_items_altered;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*)(MediaSourceCollection*, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media;
+ ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported;
+ ((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported;
+ ((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported;
+ ((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*)(LibraryPhotoSourceCollection*, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported;
+ ((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) library_photo_source_collection_real_fetch_by_numeric_id;
+ ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) library_photo_source_collection_real_fetch_by_numeric_id;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*)(MediaSourceCollection*, const gchar*)) library_photo_source_collection_real_fetch_by_source_id;
+ ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) library_photo_source_collection_real_fetch_by_source_id;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) library_photo_source_collection_real_get_event_source_ids;
+ ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) library_photo_source_collection_real_get_event_source_ids;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*)(SourceCollection*, SourceBacklink*)) library_photo_source_collection_real_has_backlink;
+ ((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_has_backlink;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- ((SourceCollectionClass *) klass)->remove_backlink = (void (*)(SourceCollection*, SourceBacklink*)) library_photo_source_collection_real_remove_backlink;
+ ((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_remove_backlink;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38492,24 +38470,24 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("master_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+ library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL] = g_signal_new ("master-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("editable_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+ library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL] = g_signal_new ("editable-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("baseline_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+ library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
- g_signal_new ("source_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 38498 "Photo.c"
+ library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
+#line 38476 "Photo.c"
}
static void library_photo_source_collection_instance_init (LibraryPhotoSourceCollection * self) {
- GeeHashMap* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- GeeTreeMultiMap* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
- GeeHashMap* _tmp4_ = NULL;
- GeeTreeMultiMap* _tmp5_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeHashMap* _tmp1_;
+ GeeTreeMultiMap* _tmp2_;
+ GeeHashMap* _tmp3_;
+ GeeHashMap* _tmp4_;
+ GeeTreeMultiMap* _tmp5_;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38538,11 +38516,11 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
_tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 38537 "Photo.c"
+#line 38515 "Photo.c"
}
-static void library_photo_source_collection_finalize (DataCollection* obj) {
+static void library_photo_source_collection_finalize (DataCollection * obj) {
LibraryPhotoSourceCollection * self;
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
@@ -38562,7 +38540,7 @@ static void library_photo_source_collection_finalize (DataCollection* obj) {
_g_object_unref0 (self->priv->photo_to_raw_development_filesize);
#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj);
-#line 38561 "Photo.c"
+#line 38539 "Photo.c"
}
@@ -38581,18 +38559,18 @@ GType library_photo_source_collection_get_type (void) {
static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) {
#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_generate_thumbnails ((LibraryPhoto*) self);
-#line 38580 "Photo.c"
+#line 38558 "Photo.c"
}
static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row) {
LibraryPhoto * self = NULL;
- PhotoRow* _tmp0_ = NULL;
- OneShotScheduler* _tmp1_ = NULL;
- PhotoRow* _tmp2_ = NULL;
- guint64 _tmp3_ = 0ULL;
- PhotoRow* _tmp7_ = NULL;
- guint64 _tmp8_ = 0ULL;
+ PhotoRow* _tmp0_;
+ OneShotScheduler* _tmp1_;
+ PhotoRow* _tmp2_;
+ guint64 _tmp3_;
+ PhotoRow* _tmp7_;
+ guint64 _tmp8_;
#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38615,10 +38593,10 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
_tmp3_ = _tmp2_->flags;
#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38614 "Photo.c"
- LibraryPhotoSourceCollection* _tmp4_ = NULL;
- PhotoRow* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
+#line 38592 "Photo.c"
+ LibraryPhotoSourceCollection* _tmp4_;
+ PhotoRow* _tmp5_;
+ const gchar* _tmp6_;
#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = library_photo_global;
#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38627,7 +38605,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
_tmp6_ = _tmp5_->backlinks;
#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38626 "Photo.c"
+#line 38604 "Photo.c"
}
#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = row;
@@ -38635,44 +38613,44 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
_tmp8_ = _tmp7_->flags;
#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38634 "Photo.c"
- PhotoRow* _tmp9_ = NULL;
- guint64 _tmp10_ = 0ULL;
+#line 38612 "Photo.c"
+ PhotoRow* _tmp9_;
+ guint64 _tmp10_;
#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = row;
#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = _tmp9_->flags;
#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38643 "Photo.c"
+#line 38621 "Photo.c"
}
#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 38647 "Photo.c"
+#line 38625 "Photo.c"
}
static LibraryPhoto* library_photo_new (PhotoRow* row) {
#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
return library_photo_construct (TYPE_LIBRARY_PHOTO, row);
-#line 38654 "Photo.c"
+#line 38632 "Photo.c"
}
static LibraryPhoto* library_photo_construct_from_import_params (GType object_type, PhotoImportParams* import_params) {
LibraryPhoto * self = NULL;
- PhotoImportParams* _tmp0_ = NULL;
- PhotoRow* _tmp1_ = NULL;
- PhotoImportParams* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- OneShotScheduler* _tmp5_ = NULL;
- PhotoImportParams* _tmp6_ = NULL;
- PhotoRow* _tmp7_ = NULL;
- guint64 _tmp8_ = 0ULL;
- PhotoImportParams* _tmp13_ = NULL;
- PhotoRow* _tmp14_ = NULL;
- guint64 _tmp15_ = 0ULL;
+ PhotoImportParams* _tmp0_;
+ PhotoRow* _tmp1_;
+ PhotoImportParams* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeCollection* _tmp4_;
+ OneShotScheduler* _tmp5_;
+ PhotoImportParams* _tmp6_;
+ PhotoRow* _tmp7_;
+ guint64 _tmp8_;
+ PhotoImportParams* _tmp13_;
+ PhotoRow* _tmp14_;
+ guint64 _tmp15_;
#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL);
#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38705,11 +38683,11 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
_tmp8_ = _tmp7_->flags;
#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38704 "Photo.c"
- LibraryPhotoSourceCollection* _tmp9_ = NULL;
- PhotoImportParams* _tmp10_ = NULL;
- PhotoRow* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+#line 38682 "Photo.c"
+ LibraryPhotoSourceCollection* _tmp9_;
+ PhotoImportParams* _tmp10_;
+ PhotoRow* _tmp11_;
+ const gchar* _tmp12_;
#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = library_photo_global;
#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38720,7 +38698,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
_tmp12_ = _tmp11_->backlinks;
#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_);
-#line 38719 "Photo.c"
+#line 38697 "Photo.c"
}
#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = import_params;
@@ -38730,10 +38708,10 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
_tmp15_ = _tmp14_->flags;
#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38729 "Photo.c"
- PhotoImportParams* _tmp16_ = NULL;
- PhotoRow* _tmp17_ = NULL;
- guint64 _tmp18_ = 0ULL;
+#line 38707 "Photo.c"
+ PhotoImportParams* _tmp16_;
+ PhotoRow* _tmp17_;
+ guint64 _tmp18_;
#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = import_params;
#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38742,46 +38720,46 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
_tmp18_ = _tmp17_->flags;
#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_upgrade_rating_flags (self, _tmp18_);
-#line 38741 "Photo.c"
+#line 38719 "Photo.c"
}
#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 38745 "Photo.c"
+#line 38723 "Photo.c"
}
static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) {
#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params);
-#line 38752 "Photo.c"
+#line 38730 "Photo.c"
}
void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
+ LibraryPhotoSourceCollection* _tmp0_;
GeeArrayList* all = NULL;
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- GeeArrayList* _tmp3_ = NULL;
- GeeArrayList* _tmp4_ = NULL;
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
+ GeeArrayList* _tmp3_;
+ GeeArrayList* _tmp4_;
GeeArrayList* all_photos = NULL;
- GeeArrayList* _tmp5_ = NULL;
+ GeeArrayList* _tmp5_;
GeeArrayList* trashed_photos = NULL;
- GeeArrayList* _tmp6_ = NULL;
+ GeeArrayList* _tmp6_;
GeeArrayList* offline_photos = NULL;
- GeeArrayList* _tmp7_ = NULL;
+ GeeArrayList* _tmp7_;
gint count = 0;
- GeeArrayList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- LibraryPhotoSourceCollection* _tmp34_ = NULL;
- GeeArrayList* _tmp35_ = NULL;
- GeeCollection* _tmp36_ = NULL;
- GeeCollection* _tmp37_ = NULL;
- LibraryPhotoSourceCollection* _tmp38_ = NULL;
- GeeArrayList* _tmp39_ = NULL;
- LibraryPhotoSourceCollection* _tmp40_ = NULL;
- GeeArrayList* _tmp41_ = NULL;
+ GeeArrayList* _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
+ LibraryPhotoSourceCollection* _tmp34_;
+ GeeArrayList* _tmp35_;
+ GeeCollection* _tmp36_;
+ GeeCollection* _tmp37_;
+ LibraryPhotoSourceCollection* _tmp38_;
+ GeeArrayList* _tmp39_;
+ LibraryPhotoSourceCollection* _tmp40_;
+ GeeArrayList* _tmp41_;
#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
photo_init_photo ();
#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38822,43 +38800,43 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
_tmp10_ = _tmp9_;
#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
count = _tmp10_;
-#line 38821 "Photo.c"
+#line 38799 "Photo.c"
{
gint ctr = 0;
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
ctr = 0;
-#line 38826 "Photo.c"
+#line 38804 "Photo.c"
{
gboolean _tmp11_ = FALSE;
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = TRUE;
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 38833 "Photo.c"
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+#line 38811 "Photo.c"
+ gint _tmp13_;
+ gint _tmp14_;
PhotoRow* row = NULL;
- GeeArrayList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gpointer _tmp17_ = NULL;
+ GeeArrayList* _tmp15_;
+ gint _tmp16_;
+ gpointer _tmp17_;
LibraryPhoto* photo = NULL;
- PhotoRow* _tmp18_ = NULL;
- LibraryPhoto* _tmp19_ = NULL;
+ PhotoRow* _tmp18_;
+ LibraryPhoto* _tmp19_;
guint64 flags = 0ULL;
- PhotoRow* _tmp20_ = NULL;
- guint64 _tmp21_ = 0ULL;
- guint64 _tmp22_ = 0ULL;
- ProgressMonitor _tmp30_ = NULL;
- void* _tmp30__target = NULL;
+ PhotoRow* _tmp20_;
+ guint64 _tmp21_;
+ guint64 _tmp22_;
+ ProgressMonitor _tmp30_;
+ void* _tmp30__target;
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp11_) {
-#line 38851 "Photo.c"
- gint _tmp12_ = 0;
+#line 38829 "Photo.c"
+ gint _tmp12_;
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = ctr;
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
ctr = _tmp12_ + 1;
-#line 38857 "Photo.c"
+#line 38835 "Photo.c"
}
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = FALSE;
@@ -38870,7 +38848,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
if (!(_tmp13_ < _tmp14_)) {
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 38869 "Photo.c"
+#line 38847 "Photo.c"
}
#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = all;
@@ -38896,42 +38874,42 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
_tmp22_ = flags;
#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) {
-#line 38895 "Photo.c"
- GeeArrayList* _tmp23_ = NULL;
- LibraryPhoto* _tmp24_ = NULL;
+#line 38873 "Photo.c"
+ GeeArrayList* _tmp23_;
+ LibraryPhoto* _tmp24_;
#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = trashed_photos;
#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp24_ = photo;
#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 38904 "Photo.c"
+#line 38882 "Photo.c"
} else {
- guint64 _tmp25_ = 0ULL;
+ guint64 _tmp25_;
#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = flags;
#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) {
-#line 38911 "Photo.c"
- GeeArrayList* _tmp26_ = NULL;
- LibraryPhoto* _tmp27_ = NULL;
+#line 38889 "Photo.c"
+ GeeArrayList* _tmp26_;
+ LibraryPhoto* _tmp27_;
#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = offline_photos;
#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = photo;
#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 38920 "Photo.c"
+#line 38898 "Photo.c"
} else {
- GeeArrayList* _tmp28_ = NULL;
- LibraryPhoto* _tmp29_ = NULL;
+ GeeArrayList* _tmp28_;
+ LibraryPhoto* _tmp29_;
#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = all_photos;
#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = photo;
#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 38930 "Photo.c"
+#line 38908 "Photo.c"
}
}
#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38940,11 +38918,11 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
_tmp30__target = monitor_target;
#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp30_ != NULL) {
-#line 38939 "Photo.c"
- ProgressMonitor _tmp31_ = NULL;
- void* _tmp31__target = NULL;
- gint _tmp32_ = 0;
- gint _tmp33_ = 0;
+#line 38917 "Photo.c"
+ ProgressMonitor _tmp31_;
+ void* _tmp31__target;
+ gint _tmp32_;
+ gint _tmp33_;
#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = monitor;
#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38955,13 +38933,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
_tmp33_ = count;
#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target);
-#line 38954 "Photo.c"
+#line 38932 "Photo.c"
}
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
_photo_row_unref0 (row);
-#line 38960 "Photo.c"
+#line 38938 "Photo.c"
}
}
}
@@ -38995,30 +38973,30 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
_g_object_unref0 (all_photos);
#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (all);
-#line 38994 "Photo.c"
+#line 38972 "Photo.c"
}
void library_photo_terminate (void) {
#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
photo_terminate_photo ();
-#line 39001 "Photo.c"
+#line 38979 "Photo.c"
}
-ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto** photo) {
+ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo) {
LibraryPhoto* _vala_photo = NULL;
ImportResult result = 0;
PhotoID photo_id = {0};
- PhotoTable* _tmp0_ = NULL;
- PhotoTable* _tmp1_ = NULL;
- PhotoImportParams* _tmp2_ = NULL;
- PhotoRow* _tmp3_ = NULL;
+ PhotoTable* _tmp0_;
+ PhotoTable* _tmp1_;
+ PhotoImportParams* _tmp2_;
+ PhotoRow* _tmp3_;
PhotoID _tmp4_ = {0};
- PhotoID _tmp5_ = {0};
- gboolean _tmp6_ = FALSE;
- PhotoImportParams* _tmp7_ = NULL;
- LibraryPhoto* _tmp8_ = NULL;
+ PhotoID _tmp5_;
+ gboolean _tmp6_;
+ PhotoImportParams* _tmp7_;
+ LibraryPhoto* _tmp8_;
#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39051,15 +39029,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
if (photo) {
#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
*photo = _vala_photo;
-#line 39050 "Photo.c"
+#line 39028 "Photo.c"
} else {
#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_vala_photo);
-#line 39054 "Photo.c"
+#line 39032 "Photo.c"
}
#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 39058 "Photo.c"
+#line 39036 "Photo.c"
}
#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = params;
@@ -39075,15 +39053,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
if (photo) {
#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
*photo = _vala_photo;
-#line 39074 "Photo.c"
+#line 39052 "Photo.c"
} else {
#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_vala_photo);
-#line 39078 "Photo.c"
+#line 39056 "Photo.c"
}
#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 39082 "Photo.c"
+#line 39060 "Photo.c"
}
@@ -39091,11 +39069,11 @@ void library_photo_import_failed (LibraryPhoto* photo) {
GError * _inner_error_ = NULL;
#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 39090 "Photo.c"
+#line 39068 "Photo.c"
{
- PhotoTable* _tmp0_ = NULL;
- PhotoTable* _tmp1_ = NULL;
- LibraryPhoto* _tmp2_ = NULL;
+ PhotoTable* _tmp0_;
+ PhotoTable* _tmp1_;
+ LibraryPhoto* _tmp2_;
PhotoID _tmp3_ = {0};
#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = photo_table_get_instance ();
@@ -39113,8 +39091,8 @@ void library_photo_import_failed (LibraryPhoto* photo) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 39112 "Photo.c"
- goto __catch406_database_error;
+#line 39090 "Photo.c"
+ goto __catch407_database_error;
}
#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -39122,14 +39100,14 @@ void library_photo_import_failed (LibraryPhoto* photo) {
g_clear_error (&_inner_error_);
#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39121 "Photo.c"
+#line 39099 "Photo.c"
}
}
- goto __finally406;
- __catch406_database_error:
+ goto __finally407;
+ __catch407_database_error:
{
GError* err = NULL;
- GError* _tmp4_ = NULL;
+ GError* _tmp4_;
#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39140,9 +39118,9 @@ void library_photo_import_failed (LibraryPhoto* photo) {
app_window_database_error (_tmp4_);
#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 39139 "Photo.c"
+#line 39117 "Photo.c"
}
- __finally406:
+ __finally407:
#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39151,16 +39129,16 @@ void library_photo_import_failed (LibraryPhoto* photo) {
g_clear_error (&_inner_error_);
#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39150 "Photo.c"
+#line 39128 "Photo.c"
}
}
static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetadata* metadata) {
LibraryPhoto * self;
- PhotoMetadata* _tmp0_ = NULL;
- LibraryPhotoSourceCollection* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
+ PhotoMetadata* _tmp0_;
+ LibraryPhotoSourceCollection* _tmp1_;
+ PhotoMetadata* _tmp2_;
#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39175,15 +39153,15 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad
_tmp2_ = metadata;
#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_);
-#line 39174 "Photo.c"
+#line 39152 "Photo.c"
}
static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMetadata* metadata) {
LibraryPhoto * self;
- PhotoMetadata* _tmp0_ = NULL;
- LibraryPhotoSourceCollection* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
+ PhotoMetadata* _tmp0_;
+ LibraryPhotoSourceCollection* _tmp1_;
+ PhotoMetadata* _tmp2_;
#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39198,15 +39176,15 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet
_tmp2_ = metadata;
#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_);
-#line 39197 "Photo.c"
+#line 39175 "Photo.c"
}
static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetadata* metadata) {
LibraryPhoto * self;
- PhotoMetadata* _tmp0_ = NULL;
- LibraryPhotoSourceCollection* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
+ PhotoMetadata* _tmp0_;
+ LibraryPhotoSourceCollection* _tmp1_;
+ PhotoMetadata* _tmp2_;
#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39221,15 +39199,15 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad
_tmp2_ = metadata;
#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_);
-#line 39220 "Photo.c"
+#line 39198 "Photo.c"
}
static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMetadata* metadata) {
LibraryPhoto * self;
- PhotoMetadata* _tmp0_ = NULL;
- LibraryPhotoSourceCollection* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
+ PhotoMetadata* _tmp0_;
+ LibraryPhotoSourceCollection* _tmp1_;
+ PhotoMetadata* _tmp2_;
#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39244,7 +39222,7 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet
_tmp2_ = metadata;
#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_);
-#line 39243 "Photo.c"
+#line 39221 "Photo.c"
}
@@ -39252,24 +39230,24 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
GError * _inner_error_ = NULL;
#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 39251 "Photo.c"
+#line 39229 "Photo.c"
{
#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_);
#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39257 "Photo.c"
- goto __catch407_g_error;
+#line 39235 "Photo.c"
+ goto __catch408_g_error;
}
}
- goto __finally407;
- __catch407_g_error:
+ goto __finally408;
+ __catch408_g_error:
{
GError* err = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ GError* _tmp2_;
+ const gchar* _tmp3_;
#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39288,9 +39266,9 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
_g_free0 (_tmp1_);
#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 39287 "Photo.c"
+#line 39265 "Photo.c"
}
- __finally407:
+ __finally408:
#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39299,18 +39277,18 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
g_clear_error (&_inner_error_);
#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39298 "Photo.c"
+#line 39276 "Photo.c"
}
#line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39302 "Photo.c"
+#line 39280 "Photo.c"
}
GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
GeeCollection* result = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp1_;
#line 5090 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39321,7 +39299,7 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
result = _tmp1_;
#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 39320 "Photo.c"
+#line 39298 "Photo.c"
}
@@ -39332,15 +39310,15 @@ void library_photo_clear_import_keywords (LibraryPhoto* self) {
_g_object_unref0 (self->priv->import_keywords);
#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->import_keywords = NULL;
-#line 39331 "Photo.c"
+#line 39309 "Photo.c"
}
static void library_photo_real_notify_altered (DataObject* base, Alteration* alteration) {
LibraryPhoto * self;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- Alteration* _tmp5_ = NULL;
+ gboolean _tmp1_;
+ Alteration* _tmp5_;
#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39349,36 +39327,36 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
_tmp1_ = self->priv->block_thumbnail_generation;
#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp1_) {
-#line 39348 "Photo.c"
- Alteration* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 39326 "Photo.c"
+ Alteration* _tmp2_;
+ gboolean _tmp3_;
#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = alteration;
#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = alteration_has_subject (_tmp2_, "image");
#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp3_;
-#line 39357 "Photo.c"
+#line 39335 "Photo.c"
} else {
#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = FALSE;
-#line 39361 "Photo.c"
+#line 39339 "Photo.c"
}
#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_) {
-#line 39365 "Photo.c"
- OneShotScheduler* _tmp4_ = NULL;
+#line 39343 "Photo.c"
+ OneShotScheduler* _tmp4_;
#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->thumbnail_scheduler;
#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW);
-#line 39371 "Photo.c"
+#line 39349 "Photo.c"
}
#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = alteration;
#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 39377 "Photo.c"
+#line 39355 "Photo.c"
}
@@ -39386,8 +39364,8 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
LibraryPhoto * self;
GdkPixbuf* result = NULL;
GdkPixbuf* pixbuf = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
GError * _inner_error_ = NULL;
#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -39403,7 +39381,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
g_propagate_error (error, _inner_error_);
#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39402 "Photo.c"
+#line 39380 "Photo.c"
}
#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
@@ -39413,13 +39391,13 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
_g_object_unref0 (pixbuf);
#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 39412 "Photo.c"
+#line 39390 "Photo.c"
}
static void library_photo_real_rotate (Photo* base, Rotation rotation) {
LibraryPhoto * self;
- Rotation _tmp0_ = 0;
+ Rotation _tmp0_;
GError * _inner_error_ = NULL;
#line 5112 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -39431,27 +39409,27 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
#line 5116 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->block_thumbnail_generation = FALSE;
-#line 39430 "Photo.c"
+#line 39408 "Photo.c"
{
- Rotation _tmp1_ = 0;
+ Rotation _tmp1_;
#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = rotation;
#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39439 "Photo.c"
- goto __catch408_g_error;
+#line 39417 "Photo.c"
+ goto __catch409_g_error;
}
}
- goto __finally408;
- __catch408_g_error:
+ goto __finally409;
+ __catch409_g_error:
{
GError* err = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ GError* _tmp4_;
+ const gchar* _tmp5_;
#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39470,9 +39448,9 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
_g_free0 (_tmp3_);
#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 39469 "Photo.c"
+#line 39447 "Photo.c"
}
- __finally408:
+ __finally409:
#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39481,11 +39459,11 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
g_clear_error (&_inner_error_);
#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39480 "Photo.c"
+#line 39458 "Photo.c"
}
#line 5130 "/home/jens/Source/shotwell/src/Photo.vala"
thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39484 "Photo.c"
+#line 39462 "Photo.c"
}
@@ -39493,9 +39471,9 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
LibraryPhoto * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
+ gint _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
GError * _inner_error_ = NULL;
#line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -39511,7 +39489,7 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
g_propagate_error (error, _inner_error_);
#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39510 "Photo.c"
+#line 39488 "Photo.c"
}
#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp0_;
@@ -39523,27 +39501,27 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
_g_object_unref0 (_tmp0_);
#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 39522 "Photo.c"
+#line 39500 "Photo.c"
}
static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) {
#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes);
-#line 39529 "Photo.c"
+#line 39507 "Photo.c"
}
static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPhotoRow* backing, BackingPhotoID* result, GError** error) {
BackingPhotoID backing_id = {0};
gboolean _tmp0_ = FALSE;
- BackingPhotoRow* _tmp1_ = NULL;
+ BackingPhotoRow* _tmp1_;
GFile* file = NULL;
- BackingPhotoRow* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
- GFile* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ BackingPhotoRow* _tmp4_;
+ const gchar* _tmp5_;
+ GFile* _tmp6_;
+ GFile* _tmp7_;
+ gboolean _tmp8_;
GError * _inner_error_ = NULL;
#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (self));
@@ -39557,17 +39535,17 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
if (_tmp1_ == NULL) {
#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = TRUE;
-#line 39556 "Photo.c"
+#line 39534 "Photo.c"
} else {
- BackingPhotoRow* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ BackingPhotoRow* _tmp2_;
+ const gchar* _tmp3_;
#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = backing;
#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _tmp2_->filepath;
#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp0_ = _tmp3_ == NULL;
-#line 39566 "Photo.c"
+#line 39544 "Photo.c"
}
#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_) {
@@ -39575,7 +39553,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
*result = backing_id;
#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39574 "Photo.c"
+#line 39552 "Photo.c"
}
#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = backing;
@@ -39591,16 +39569,16 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_tmp8_ = g_file_query_exists (_tmp7_, NULL);
#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_) {
-#line 39590 "Photo.c"
+#line 39568 "Photo.c"
GFile* dupe_file = NULL;
- GFile* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
+ GFile* _tmp9_;
+ GFile* _tmp10_;
DetectedPhotoInformation* detected = NULL;
BackingPhotoRow* state = NULL;
- GFile* _tmp11_ = NULL;
+ GFile* _tmp11_;
DetectedPhotoInformation* _tmp12_ = NULL;
- BackingPhotoRow* _tmp13_ = NULL;
- BackingPhotoRow* _tmp14_ = NULL;
+ BackingPhotoRow* _tmp13_;
+ BackingPhotoRow* _tmp14_;
#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = file;
#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39615,7 +39593,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_g_object_unref0 (file);
#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39614 "Photo.c"
+#line 39592 "Photo.c"
}
#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = dupe_file;
@@ -39639,18 +39617,18 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_g_object_unref0 (file);
#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39638 "Photo.c"
+#line 39616 "Photo.c"
}
#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = state;
#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_ != NULL) {
-#line 39644 "Photo.c"
- BackingPhotoTable* _tmp15_ = NULL;
- BackingPhotoTable* _tmp16_ = NULL;
- BackingPhotoRow* _tmp17_ = NULL;
- BackingPhotoRow* _tmp18_ = NULL;
- BackingPhotoID _tmp19_ = {0};
+#line 39622 "Photo.c"
+ BackingPhotoTable* _tmp15_;
+ BackingPhotoTable* _tmp16_;
+ BackingPhotoRow* _tmp17_;
+ BackingPhotoRow* _tmp18_;
+ BackingPhotoID _tmp19_;
#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = backing_photo_table_get_instance ();
#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39675,7 +39653,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_g_object_unref0 (file);
#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39674 "Photo.c"
+#line 39652 "Photo.c"
}
#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = state;
@@ -39683,7 +39661,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_tmp19_ = _tmp18_->id;
#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
backing_id = _tmp19_;
-#line 39682 "Photo.c"
+#line 39660 "Photo.c"
}
#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
_backing_photo_row_unref0 (state);
@@ -39691,7 +39669,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_detected_photo_information_unref0 (detected);
#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (dupe_file);
-#line 39690 "Photo.c"
+#line 39668 "Photo.c"
}
#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
*result = backing_id;
@@ -39699,70 +39677,70 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
_g_object_unref0 (file);
#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 39698 "Photo.c"
+#line 39676 "Photo.c"
}
LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
LibraryPhoto* result = NULL;
GFile* dupe_file = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ GFile* _tmp3_;
BackingPhotoID dupe_editable_id = {0};
- BackingPhotoRow* _tmp4_ = NULL;
- BackingPhotoRow* _tmp5_ = NULL;
+ BackingPhotoRow* _tmp4_;
+ BackingPhotoRow* _tmp5_;
BackingPhotoID _tmp6_ = {0};
- BackingPhotoID _tmp7_ = {0};
+ BackingPhotoID _tmp7_;
BackingPhotoID dupe_raw_shotwell_id = {0};
- BackingPhotoRow* _tmp8_ = NULL;
- BackingPhotoRow* _tmp9_ = NULL;
+ BackingPhotoRow* _tmp8_;
+ BackingPhotoRow* _tmp9_;
BackingPhotoID _tmp10_ = {0};
- BackingPhotoID _tmp11_ = {0};
+ BackingPhotoID _tmp11_;
BackingPhotoID dupe_raw_camera_id = {0};
- BackingPhotoRow* _tmp12_ = NULL;
- BackingPhotoRow* _tmp13_ = NULL;
+ BackingPhotoRow* _tmp12_;
+ BackingPhotoRow* _tmp13_;
BackingPhotoID _tmp14_ = {0};
- BackingPhotoID _tmp15_ = {0};
+ BackingPhotoID _tmp15_;
BackingPhotoID dupe_raw_embedded_id = {0};
- BackingPhotoRow* _tmp16_ = NULL;
- BackingPhotoRow* _tmp17_ = NULL;
+ BackingPhotoRow* _tmp16_;
+ BackingPhotoRow* _tmp17_;
BackingPhotoID _tmp18_ = {0};
- BackingPhotoID _tmp19_ = {0};
+ BackingPhotoID _tmp19_;
PhotoID dupe_id = {0};
- PhotoTable* _tmp20_ = NULL;
- PhotoTable* _tmp21_ = NULL;
+ PhotoTable* _tmp20_;
+ PhotoTable* _tmp21_;
PhotoID _tmp22_ = {0};
- GFile* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- BackingPhotoID _tmp26_ = {0};
- BackingPhotoID _tmp27_ = {0};
- BackingPhotoID _tmp28_ = {0};
- BackingPhotoID _tmp29_ = {0};
+ GFile* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ BackingPhotoID _tmp26_;
+ BackingPhotoID _tmp27_;
+ BackingPhotoID _tmp28_;
+ BackingPhotoID _tmp29_;
PhotoID _tmp30_ = {0};
- PhotoID _tmp31_ = {0};
+ PhotoID _tmp31_;
PhotoRow* dupe_row = NULL;
- PhotoTable* _tmp32_ = NULL;
- PhotoTable* _tmp33_ = NULL;
- PhotoID _tmp34_ = {0};
- PhotoRow* _tmp35_ = NULL;
- PhotoRow* _tmp36_ = NULL;
+ PhotoTable* _tmp32_;
+ PhotoTable* _tmp33_;
+ PhotoID _tmp34_;
+ PhotoRow* _tmp35_;
+ PhotoRow* _tmp36_;
LibraryPhoto* dupe = NULL;
- PhotoRow* _tmp37_ = NULL;
- LibraryPhoto* _tmp38_ = NULL;
- LibraryPhoto* _tmp39_ = NULL;
- LibraryPhotoSourceCollection* _tmp40_ = NULL;
- LibraryPhoto* _tmp41_ = NULL;
- LibraryPhoto* _tmp42_ = NULL;
- Event* _tmp43_ = NULL;
- Event* _tmp44_ = NULL;
- gboolean _tmp45_ = FALSE;
+ PhotoRow* _tmp37_;
+ LibraryPhoto* _tmp38_;
+ LibraryPhoto* _tmp39_;
+ LibraryPhotoSourceCollection* _tmp40_;
+ LibraryPhoto* _tmp41_;
+ LibraryPhoto* _tmp42_;
+ Event* _tmp43_;
+ Event* _tmp44_;
+ gboolean _tmp45_;
GeeCollection* tags = NULL;
- TagSourceCollection* _tmp50_ = NULL;
- GeeList* _tmp51_ = NULL;
- GeeCollection* _tmp52_ = NULL;
+ TagSourceCollection* _tmp50_;
+ GeeList* _tmp51_;
+ GeeCollection* _tmp52_;
GError * _inner_error_ = NULL;
#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
@@ -39784,7 +39762,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39783 "Photo.c"
+#line 39761 "Photo.c"
}
#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
@@ -39806,7 +39784,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_g_object_unref0 (dupe_file);
#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39805 "Photo.c"
+#line 39783 "Photo.c"
}
#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL);
@@ -39828,7 +39806,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_g_object_unref0 (dupe_file);
#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39827 "Photo.c"
+#line 39805 "Photo.c"
}
#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA);
@@ -39850,7 +39828,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_g_object_unref0 (dupe_file);
#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39849 "Photo.c"
+#line 39827 "Photo.c"
}
#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED);
@@ -39872,7 +39850,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_g_object_unref0 (dupe_file);
#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
return NULL;
-#line 39871 "Photo.c"
+#line 39849 "Photo.c"
}
#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = photo_table_get_instance ();
@@ -39946,11 +39924,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_g_object_unref0 (_tmp44_);
#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp45_) {
-#line 39945 "Photo.c"
- LibraryPhoto* _tmp46_ = NULL;
- Event* _tmp47_ = NULL;
- Event* _tmp48_ = NULL;
- LibraryPhoto* _tmp49_ = NULL;
+#line 39923 "Photo.c"
+ LibraryPhoto* _tmp46_;
+ Event* _tmp47_;
+ Event* _tmp48_;
+ LibraryPhoto* _tmp49_;
#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp46_ = dupe;
#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39963,7 +39941,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource));
#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp48_);
-#line 39962 "Photo.c"
+#line 39940 "Photo.c"
}
#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp50_ = tag_global;
@@ -39975,11 +39953,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_tmp52_ = tags;
#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp52_ != NULL) {
-#line 39974 "Photo.c"
+#line 39952 "Photo.c"
{
GeeIterator* _tag_it = NULL;
- GeeCollection* _tmp53_ = NULL;
- GeeIterator* _tmp54_ = NULL;
+ GeeCollection* _tmp53_;
+ GeeIterator* _tmp54_;
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp53_ = tags;
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39988,14 +39966,14 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_tag_it = _tmp54_;
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 39987 "Photo.c"
- GeeIterator* _tmp55_ = NULL;
- gboolean _tmp56_ = FALSE;
+#line 39965 "Photo.c"
+ GeeIterator* _tmp55_;
+ gboolean _tmp56_;
Tag* tag = NULL;
- GeeIterator* _tmp57_ = NULL;
- gpointer _tmp58_ = NULL;
- Tag* _tmp59_ = NULL;
- LibraryPhoto* _tmp60_ = NULL;
+ GeeIterator* _tmp57_;
+ gpointer _tmp58_;
+ Tag* _tmp59_;
+ LibraryPhoto* _tmp60_;
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = _tag_it;
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40004,7 +39982,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
if (!_tmp56_) {
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 40003 "Photo.c"
+#line 39981 "Photo.c"
}
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = _tag_it;
@@ -40020,11 +39998,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (tag);
-#line 40019 "Photo.c"
+#line 39997 "Photo.c"
}
#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tag_it);
-#line 40023 "Photo.c"
+#line 40001 "Photo.c"
}
}
#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40037,7 +40015,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
_g_object_unref0 (dupe_file);
#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40036 "Photo.c"
+#line 40014 "Photo.c"
}
@@ -40046,13 +40024,13 @@ static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 curr
g_return_if_fail (IS_LIBRARY_PHOTO (self));
#line 5204 "/home/jens/Source/shotwell/src/Photo.vala"
spin_event_loop ();
-#line 40045 "Photo.c"
+#line 40023 "Photo.c"
}
static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) {
- guint64 _tmp0_ = 0ULL;
- guint64 _tmp1_ = 0ULL;
+ guint64 _tmp0_;
+ guint64 _tmp1_;
#line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO (self));
#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40063,7 +40041,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED);
#line 5210 "/home/jens/Source/shotwell/src/Photo.vala"
photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL);
-#line 40062 "Photo.c"
+#line 40040 "Photo.c"
}
#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = flags;
@@ -40073,7 +40051,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE);
#line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL);
-#line 40072 "Photo.c"
+#line 40050 "Photo.c"
}
}
@@ -40081,7 +40059,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
static gboolean library_photo_real_is_trashed (MediaSource* base) {
LibraryPhoto * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 5220 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40090,7 +40068,7 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
result = _tmp0_;
#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40089 "Photo.c"
+#line 40067 "Photo.c"
}
@@ -40100,7 +40078,7 @@ static void library_photo_real_trash (MediaSource* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5225 "/home/jens/Source/shotwell/src/Photo.vala"
photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 40099 "Photo.c"
+#line 40077 "Photo.c"
}
@@ -40110,14 +40088,14 @@ static void library_photo_real_untrash (MediaSource* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5229 "/home/jens/Source/shotwell/src/Photo.vala"
photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 40109 "Photo.c"
+#line 40087 "Photo.c"
}
static gboolean library_photo_real_is_offline (Monitorable* base) {
LibraryPhoto * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40126,7 +40104,7 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
result = _tmp0_;
#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40125 "Photo.c"
+#line 40103 "Photo.c"
}
@@ -40136,7 +40114,7 @@ static void library_photo_real_mark_offline (Monitorable* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5237 "/home/jens/Source/shotwell/src/Photo.vala"
photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40135 "Photo.c"
+#line 40113 "Photo.c"
}
@@ -40146,14 +40124,14 @@ static void library_photo_real_mark_online (Monitorable* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5241 "/home/jens/Source/shotwell/src/Photo.vala"
photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40145 "Photo.c"
+#line 40123 "Photo.c"
}
static gboolean library_photo_real_is_flagged (Flaggable* base) {
LibraryPhoto * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 5244 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40162,14 +40140,14 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
result = _tmp0_;
#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40161 "Photo.c"
+#line 40139 "Photo.c"
}
static void library_photo_real_mark_flagged (Flaggable* base) {
LibraryPhoto * self;
- Alteration* _tmp0_ = NULL;
- Alteration* _tmp1_ = NULL;
+ Alteration* _tmp0_;
+ Alteration* _tmp1_;
#line 5248 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40180,14 +40158,14 @@ static void library_photo_real_mark_flagged (Flaggable* base) {
photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp1_);
-#line 40179 "Photo.c"
+#line 40157 "Photo.c"
}
static void library_photo_real_mark_unflagged (Flaggable* base) {
LibraryPhoto * self;
- Alteration* _tmp0_ = NULL;
- Alteration* _tmp1_ = NULL;
+ Alteration* _tmp0_;
+ Alteration* _tmp1_;
#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40198,7 +40176,7 @@ static void library_photo_real_mark_unflagged (Flaggable* base) {
photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
_alteration_unref0 (_tmp1_);
-#line 40197 "Photo.c"
+#line 40175 "Photo.c"
}
@@ -40206,8 +40184,8 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
LibraryPhoto * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp1_;
+ gboolean _tmp3_;
GError * _inner_error_ = NULL;
#line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -40217,13 +40195,13 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
_tmp0_ = _tmp1_;
#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 40216 "Photo.c"
+#line 40194 "Photo.c"
gboolean _tmp2_ = FALSE;
#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
g_propagate_error (error, _inner_error_);
#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
return _tmp2_;
-#line 40222 "Photo.c"
+#line 40200 "Photo.c"
}
#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
if (!_tmp0_) {
@@ -40231,7 +40209,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
result = FALSE;
#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40230 "Photo.c"
+#line 40208 "Photo.c"
}
#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -40239,7 +40217,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
result = _tmp3_;
#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40238 "Photo.c"
+#line 40216 "Photo.c"
}
@@ -40256,11 +40234,11 @@ static void library_photo_real_destroy (DataSource* base) {
photo_id = _tmp0_;
#line 5269 "/home/jens/Source/shotwell/src/Photo.vala"
thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 40255 "Photo.c"
+#line 40233 "Photo.c"
{
- PhotoTable* _tmp1_ = NULL;
- PhotoTable* _tmp2_ = NULL;
- PhotoID _tmp3_ = {0};
+ PhotoTable* _tmp1_;
+ PhotoTable* _tmp2_;
+ PhotoID _tmp3_;
#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = photo_table_get_instance ();
#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40275,8 +40253,8 @@ static void library_photo_real_destroy (DataSource* base) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 40274 "Photo.c"
- goto __catch409_database_error;
+#line 40252 "Photo.c"
+ goto __catch410_database_error;
}
#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -40284,14 +40262,14 @@ static void library_photo_real_destroy (DataSource* base) {
g_clear_error (&_inner_error_);
#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 40283 "Photo.c"
+#line 40261 "Photo.c"
}
}
- goto __finally409;
- __catch409_database_error:
+ goto __finally410;
+ __catch410_database_error:
{
GError* err = NULL;
- GError* _tmp4_ = NULL;
+ GError* _tmp4_;
#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
err = _inner_error_;
#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40302,9 +40280,9 @@ static void library_photo_real_destroy (DataSource* base) {
app_window_database_error (_tmp4_);
#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
_g_error_free0 (err);
-#line 40301 "Photo.c"
+#line 40279 "Photo.c"
}
- __finally409:
+ __finally410:
#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40313,22 +40291,22 @@ static void library_photo_real_destroy (DataSource* base) {
g_clear_error (&_inner_error_);
#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 40312 "Photo.c"
+#line 40290 "Photo.c"
}
#line 5280 "/home/jens/Source/shotwell/src/Photo.vala"
DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource));
-#line 40316 "Photo.c"
+#line 40294 "Photo.c"
}
gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format) {
gboolean result = FALSE;
- GFile* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
+ GFile* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ PhotoFileFormat _tmp3_;
PhotoID _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40347,25 +40325,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna
result = _tmp5_;
#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40346 "Photo.c"
+#line 40324 "Photo.c"
}
void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result) {
PhotoID* ids = NULL;
- GFile* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
- gint _tmp4_ = 0;
- PhotoID* _tmp5_ = NULL;
- gint ids_length1 = 0;
- gint _ids_size_ = 0;
+ GFile* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ PhotoFileFormat _tmp3_;
+ gint _tmp4_;
+ PhotoID* _tmp5_;
+ gint ids_length1;
+ gint _ids_size_;
gboolean _tmp6_ = FALSE;
- PhotoID* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- PhotoID* _tmp10_ = NULL;
- gint _tmp10__length1 = 0;
+ PhotoID* _tmp7_;
+ gint _tmp7__length1;
+ PhotoID* _tmp10_;
+ gint _tmp10__length1;
PhotoID _tmp18_ = {0};
#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail ((file == NULL) || G_IS_FILE (file));
@@ -40393,21 +40371,21 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
if (_tmp7_ == NULL) {
#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = TRUE;
-#line 40392 "Photo.c"
+#line 40370 "Photo.c"
} else {
- PhotoID* _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
+ PhotoID* _tmp8_;
+ gint _tmp8__length1;
#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8_ = ids;
#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp8__length1 = ids_length1;
#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = _tmp8__length1 == 0;
-#line 40402 "Photo.c"
+#line 40380 "Photo.c"
}
#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_) {
-#line 40406 "Photo.c"
+#line 40384 "Photo.c"
PhotoID _tmp9_ = {0};
#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
@@ -40417,13 +40395,13 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
ids = (g_free (ids), NULL);
#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 40416 "Photo.c"
+#line 40394 "Photo.c"
}
#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = ids;
#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10__length1 = ids_length1;
-#line 40422 "Photo.c"
+#line 40400 "Photo.c"
{
PhotoID* id_collection = NULL;
gint id_collection_length1 = 0;
@@ -40435,18 +40413,18 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
id_collection_length1 = _tmp10__length1;
#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 40434 "Photo.c"
+#line 40412 "Photo.c"
PhotoID id = {0};
#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
id = id_collection[id_it];
-#line 40438 "Photo.c"
+#line 40416 "Photo.c"
{
LibraryPhoto* photo = NULL;
- LibraryPhotoSourceCollection* _tmp11_ = NULL;
- PhotoID _tmp12_ = {0};
- LibraryPhoto* _tmp13_ = NULL;
+ LibraryPhotoSourceCollection* _tmp11_;
+ PhotoID _tmp12_;
+ LibraryPhoto* _tmp13_;
gboolean _tmp14_ = FALSE;
- LibraryPhoto* _tmp15_ = NULL;
+ LibraryPhoto* _tmp15_;
#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = library_photo_global;
#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40459,20 +40437,20 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
_tmp15_ = photo;
#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_ != NULL) {
-#line 40458 "Photo.c"
- LibraryPhoto* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
+#line 40436 "Photo.c"
+ LibraryPhoto* _tmp16_;
+ gboolean _tmp17_;
#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = photo;
#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = !_tmp17_;
-#line 40467 "Photo.c"
+#line 40445 "Photo.c"
} else {
#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = FALSE;
-#line 40471 "Photo.c"
+#line 40449 "Photo.c"
}
#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp14_) {
@@ -40484,11 +40462,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
ids = (g_free (ids), NULL);
#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 40483 "Photo.c"
+#line 40461 "Photo.c"
}
#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 40487 "Photo.c"
+#line 40465 "Photo.c"
}
}
}
@@ -40500,7 +40478,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
ids = (g_free (ids), NULL);
#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
return;
-#line 40499 "Photo.c"
+#line 40477 "Photo.c"
}
@@ -40508,27 +40486,27 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
LibraryPhoto * self;
gboolean result = FALSE;
GeeList* tags = NULL;
- TagSourceCollection* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ TagSourceCollection* _tmp0_;
+ GeeList* _tmp1_;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
- Rating _tmp11_ = 0;
- PhotoMetadata* _tmp12_ = NULL;
- Rating _tmp13_ = 0;
+ PhotoMetadata* _tmp2_;
+ PhotoMetadata* _tmp3_;
+ Rating _tmp11_;
+ PhotoMetadata* _tmp12_;
+ Rating _tmp13_;
GeeSet* keywords = NULL;
- PhotoMetadata* _tmp14_ = NULL;
- GeeSet* _tmp15_ = NULL;
+ PhotoMetadata* _tmp14_;
+ GeeSet* _tmp15_;
gint _tmp16_ = 0;
- GeeList* _tmp17_ = NULL;
+ GeeList* _tmp17_;
gint tags_count = 0;
gint _tmp21_ = 0;
- GeeSet* _tmp22_ = NULL;
+ GeeSet* _tmp22_;
gint keywords_count = 0;
- gint _tmp26_ = 0;
- gint _tmp27_ = 0;
+ gint _tmp26_;
+ gint _tmp27_;
gboolean _tmp28_ = FALSE;
- GeeList* _tmp29_ = NULL;
+ GeeList* _tmp29_;
#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40545,21 +40523,21 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tmp3_ = metadata;
#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp3_ == NULL) {
-#line 40544 "Photo.c"
+#line 40522 "Photo.c"
gboolean _tmp4_ = FALSE;
gboolean _tmp5_ = FALSE;
- GeeList* _tmp6_ = NULL;
+ GeeList* _tmp6_;
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = tags;
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp6_ != NULL) {
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = TRUE;
-#line 40554 "Photo.c"
+#line 40532 "Photo.c"
} else {
- GeeList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+ GeeList* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp7_ = tags;
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40568,20 +40546,20 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tmp9_ = _tmp8_;
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _tmp9_ > 0;
-#line 40567 "Photo.c"
+#line 40545 "Photo.c"
}
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = TRUE;
-#line 40573 "Photo.c"
+#line 40551 "Photo.c"
} else {
- Rating _tmp10_ = 0;
+ Rating _tmp10_;
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = _tmp10_ != RATING_UNRATED;
-#line 40580 "Photo.c"
+#line 40558 "Photo.c"
}
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
result = _tmp4_;
@@ -40591,7 +40569,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_g_object_unref0 (tags);
#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40590 "Photo.c"
+#line 40568 "Photo.c"
}
#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -40609,7 +40587,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_g_object_unref0 (tags);
#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40608 "Photo.c"
+#line 40586 "Photo.c"
}
#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = metadata;
@@ -40621,10 +40599,10 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tmp17_ = tags;
#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp17_ != NULL) {
-#line 40620 "Photo.c"
- GeeList* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+#line 40598 "Photo.c"
+ GeeList* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = tags;
#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40633,11 +40611,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tmp20_ = _tmp19_;
#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = _tmp20_;
-#line 40632 "Photo.c"
+#line 40610 "Photo.c"
} else {
#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp16_ = 0;
-#line 40636 "Photo.c"
+#line 40614 "Photo.c"
}
#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
tags_count = _tmp16_;
@@ -40645,10 +40623,10 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tmp22_ = keywords;
#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_ != NULL) {
-#line 40644 "Photo.c"
- GeeSet* _tmp23_ = NULL;
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+#line 40622 "Photo.c"
+ GeeSet* _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = keywords;
#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40657,11 +40635,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tmp25_ = _tmp24_;
#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = _tmp25_;
-#line 40656 "Photo.c"
+#line 40634 "Photo.c"
} else {
#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = 0;
-#line 40660 "Photo.c"
+#line 40638 "Photo.c"
}
#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
keywords_count = _tmp21_;
@@ -40681,35 +40659,35 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_g_object_unref0 (tags);
#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40680 "Photo.c"
+#line 40658 "Photo.c"
}
#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp29_ = tags;
#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp29_ != NULL) {
-#line 40686 "Photo.c"
- GeeSet* _tmp30_ = NULL;
+#line 40664 "Photo.c"
+ GeeSet* _tmp30_;
#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = keywords;
#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = _tmp30_ != NULL;
-#line 40692 "Photo.c"
+#line 40670 "Photo.c"
} else {
#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = FALSE;
-#line 40696 "Photo.c"
+#line 40674 "Photo.c"
}
#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp28_) {
-#line 40700 "Photo.c"
+#line 40678 "Photo.c"
{
GeeList* _tag_list = NULL;
- GeeList* _tmp31_ = NULL;
- GeeList* _tmp32_ = NULL;
+ GeeList* _tmp31_;
+ GeeList* _tmp32_;
gint _tag_size = 0;
- GeeList* _tmp33_ = NULL;
- gint _tmp34_ = 0;
- gint _tmp35_ = 0;
+ GeeList* _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
gint _tag_index = 0;
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp31_ = tags;
@@ -40729,22 +40707,22 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_tag_index = -1;
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 40728 "Photo.c"
- gint _tmp36_ = 0;
- gint _tmp37_ = 0;
- gint _tmp38_ = 0;
+#line 40706 "Photo.c"
+ gint _tmp36_;
+ gint _tmp37_;
+ gint _tmp38_;
Tag* tag = NULL;
- GeeList* _tmp39_ = NULL;
- gint _tmp40_ = 0;
- gpointer _tmp41_ = NULL;
- GeeSet* _tmp42_ = NULL;
- Tag* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
- gchar* _tmp45_ = NULL;
- gchar* _tmp46_ = NULL;
- gchar* _tmp47_ = NULL;
- gboolean _tmp48_ = FALSE;
- gboolean _tmp49_ = FALSE;
+ GeeList* _tmp39_;
+ gint _tmp40_;
+ gpointer _tmp41_;
+ GeeSet* _tmp42_;
+ Tag* _tmp43_;
+ gchar* _tmp44_;
+ gchar* _tmp45_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
+ gboolean _tmp48_;
+ gboolean _tmp49_;
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = _tag_index;
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40757,7 +40735,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
if (!(_tmp37_ < _tmp38_)) {
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 40756 "Photo.c"
+#line 40734 "Photo.c"
}
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = _tag_list;
@@ -40803,15 +40781,15 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_g_object_unref0 (tags);
#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40802 "Photo.c"
+#line 40780 "Photo.c"
}
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (tag);
-#line 40806 "Photo.c"
+#line 40784 "Photo.c"
}
#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tag_list);
-#line 40810 "Photo.c"
+#line 40788 "Photo.c"
}
}
#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40824,18 +40802,18 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
_g_object_unref0 (tags);
#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 40823 "Photo.c"
+#line 40801 "Photo.c"
}
static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) {
LibraryPhoto * self;
GeeList* photo_tags = NULL;
- TagSourceCollection* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
- PhotoMetadata* _tmp22_ = NULL;
- Rating _tmp23_ = 0;
+ TagSourceCollection* _tmp0_;
+ GeeList* _tmp1_;
+ GeeList* _tmp2_;
+ PhotoMetadata* _tmp22_;
+ Rating _tmp23_;
#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40850,24 +40828,24 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
_tmp2_ = photo_tags;
#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp2_ != NULL) {
-#line 40849 "Photo.c"
+#line 40827 "Photo.c"
GeeCollection* string_tags = NULL;
- GeeArrayList* _tmp3_ = NULL;
- PhotoMetadata* _tmp19_ = NULL;
- GeeCollection* _tmp20_ = NULL;
+ GeeArrayList* _tmp3_;
+ PhotoMetadata* _tmp19_;
+ GeeCollection* _tmp20_;
#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 40858 "Photo.c"
+#line 40836 "Photo.c"
{
GeeList* _tag_list = NULL;
- GeeList* _tmp4_ = NULL;
- GeeList* _tmp5_ = NULL;
+ GeeList* _tmp4_;
+ GeeList* _tmp5_;
gint _tag_size = 0;
- GeeList* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ GeeList* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
gint _tag_index = 0;
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = photo_tags;
@@ -40887,18 +40865,18 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
_tag_index = -1;
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 40886 "Photo.c"
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+#line 40864 "Photo.c"
+ gint _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
Tag* tag = NULL;
- GeeList* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gpointer _tmp14_ = NULL;
- GeeCollection* _tmp15_ = NULL;
- Tag* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ GeeList* _tmp12_;
+ gint _tmp13_;
+ gpointer _tmp14_;
+ GeeCollection* _tmp15_;
+ Tag* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = _tag_index;
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40911,7 +40889,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
if (!(_tmp10_ < _tmp11_)) {
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 40910 "Photo.c"
+#line 40888 "Photo.c"
}
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _tag_list;
@@ -40935,11 +40913,11 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
_g_free0 (_tmp18_);
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (tag);
-#line 40934 "Photo.c"
+#line 40912 "Photo.c"
}
#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tag_list);
-#line 40938 "Photo.c"
+#line 40916 "Photo.c"
}
#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp19_ = metadata;
@@ -40949,14 +40927,14 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (string_tags);
-#line 40948 "Photo.c"
+#line 40926 "Photo.c"
} else {
- PhotoMetadata* _tmp21_ = NULL;
+ PhotoMetadata* _tmp21_;
#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp21_ = metadata;
#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 40955 "Photo.c"
+#line 40933 "Photo.c"
}
#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp22_ = metadata;
@@ -40966,20 +40944,20 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
photo_metadata_set_rating (_tmp22_, _tmp23_);
#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo_tags);
-#line 40965 "Photo.c"
+#line 40943 "Photo.c"
}
static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) {
LibraryPhoto * self;
HierarchicalTagIndex* new_htag_index = NULL;
- PhotoMetadata* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ PhotoMetadata* _tmp0_;
+ gboolean _tmp1_;
GeeCollection* keywords = NULL;
- PhotoMetadata* _tmp6_ = NULL;
- GeeSet* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- HierarchicalTagIndex* _tmp39_ = NULL;
+ PhotoMetadata* _tmp6_;
+ GeeSet* _tmp7_;
+ GeeCollection* _tmp8_;
+ HierarchicalTagIndex* _tmp39_;
#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40992,11 +40970,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_);
#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp1_) {
-#line 40991 "Photo.c"
- PhotoMetadata* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- HierarchicalTagIndex* _tmp5_ = NULL;
+#line 40969 "Photo.c"
+ PhotoMetadata* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ HierarchicalTagIndex* _tmp5_;
#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp2_ = metadata;
#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41011,7 +40989,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
new_htag_index = _tmp5_;
#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp4_);
-#line 41010 "Photo.c"
+#line 40988 "Photo.c"
}
#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = metadata;
@@ -41023,11 +41001,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_tmp8_ = keywords;
#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp8_ != NULL) {
-#line 41022 "Photo.c"
+#line 41000 "Photo.c"
{
GeeIterator* _keyword_it = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = keywords;
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41036,29 +41014,29 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_keyword_it = _tmp10_;
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41035 "Photo.c"
- GeeIterator* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 41013 "Photo.c"
+ GeeIterator* _tmp11_;
+ gboolean _tmp12_;
gchar* keyword = NULL;
- GeeIterator* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
+ GeeIterator* _tmp13_;
+ gpointer _tmp14_;
gboolean _tmp15_ = FALSE;
- HierarchicalTagIndex* _tmp16_ = NULL;
+ HierarchicalTagIndex* _tmp16_;
gchar* safe_keyword = NULL;
- const gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
gchar* promoted_keyword = NULL;
- const gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- TagSourceCollection* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
- TagSourceCollection* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- gboolean _tmp32_ = FALSE;
- const gchar* _tmp36_ = NULL;
- Tag* _tmp37_ = NULL;
- Tag* _tmp38_ = NULL;
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
+ TagSourceCollection* _tmp24_;
+ const gchar* _tmp25_;
+ gboolean _tmp26_;
+ TagSourceCollection* _tmp30_;
+ const gchar* _tmp31_;
+ gboolean _tmp32_;
+ const gchar* _tmp36_;
+ Tag* _tmp37_;
+ Tag* _tmp38_;
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp11_ = _keyword_it;
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41067,7 +41045,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
if (!_tmp12_) {
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41066 "Photo.c"
+#line 41044 "Photo.c"
}
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = _keyword_it;
@@ -41079,10 +41057,10 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_tmp16_ = new_htag_index;
#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp16_ != NULL) {
-#line 41078 "Photo.c"
- HierarchicalTagIndex* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+#line 41056 "Photo.c"
+ HierarchicalTagIndex* _tmp17_;
+ const gchar* _tmp18_;
+ gboolean _tmp19_;
#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp17_ = new_htag_index;
#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41091,11 +41069,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_);
#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = _tmp19_;
-#line 41090 "Photo.c"
+#line 41068 "Photo.c"
} else {
#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp15_ = FALSE;
-#line 41094 "Photo.c"
+#line 41072 "Photo.c"
}
#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp15_) {
@@ -41103,7 +41081,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_g_free0 (keyword);
#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
continue;
-#line 41102 "Photo.c"
+#line 41080 "Photo.c"
}
#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = keyword;
@@ -41125,10 +41103,10 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE);
#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp26_) {
-#line 41124 "Photo.c"
- const gchar* _tmp27_ = NULL;
- Tag* _tmp28_ = NULL;
- Tag* _tmp29_ = NULL;
+#line 41102 "Photo.c"
+ const gchar* _tmp27_;
+ Tag* _tmp28_;
+ Tag* _tmp29_;
#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = safe_keyword;
#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41147,7 +41125,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_g_free0 (keyword);
#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
continue;
-#line 41146 "Photo.c"
+#line 41124 "Photo.c"
}
#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = tag_global;
@@ -41157,10 +41135,10 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE);
#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp32_) {
-#line 41156 "Photo.c"
- const gchar* _tmp33_ = NULL;
- Tag* _tmp34_ = NULL;
- Tag* _tmp35_ = NULL;
+#line 41134 "Photo.c"
+ const gchar* _tmp33_;
+ Tag* _tmp34_;
+ Tag* _tmp35_;
#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp33_ = promoted_keyword;
#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41179,7 +41157,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_g_free0 (keyword);
#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
continue;
-#line 41178 "Photo.c"
+#line 41156 "Photo.c"
}
#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp36_ = keyword;
@@ -41197,25 +41175,25 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_g_free0 (safe_keyword);
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (keyword);
-#line 41196 "Photo.c"
+#line 41174 "Photo.c"
}
#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_keyword_it);
-#line 41200 "Photo.c"
+#line 41178 "Photo.c"
}
}
#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp39_ = new_htag_index;
#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp39_ != NULL) {
-#line 41207 "Photo.c"
+#line 41185 "Photo.c"
{
GeeIterator* _path_it = NULL;
- HierarchicalTagIndex* _tmp40_ = NULL;
- GeeCollection* _tmp41_ = NULL;
- GeeCollection* _tmp42_ = NULL;
- GeeIterator* _tmp43_ = NULL;
- GeeIterator* _tmp44_ = NULL;
+ HierarchicalTagIndex* _tmp40_;
+ GeeCollection* _tmp41_;
+ GeeCollection* _tmp42_;
+ GeeIterator* _tmp43_;
+ GeeIterator* _tmp44_;
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = new_htag_index;
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41232,15 +41210,15 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_path_it = _tmp44_;
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41231 "Photo.c"
- GeeIterator* _tmp45_ = NULL;
- gboolean _tmp46_ = FALSE;
+#line 41209 "Photo.c"
+ GeeIterator* _tmp45_;
+ gboolean _tmp46_;
gchar* path = NULL;
- GeeIterator* _tmp47_ = NULL;
- gpointer _tmp48_ = NULL;
- const gchar* _tmp49_ = NULL;
- Tag* _tmp50_ = NULL;
- Tag* _tmp51_ = NULL;
+ GeeIterator* _tmp47_;
+ gpointer _tmp48_;
+ const gchar* _tmp49_;
+ Tag* _tmp50_;
+ Tag* _tmp51_;
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = _path_it;
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41249,7 +41227,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
if (!_tmp46_) {
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41248 "Photo.c"
+#line 41226 "Photo.c"
}
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp47_ = _path_it;
@@ -41269,18 +41247,18 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
_g_object_unref0 (_tmp51_);
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
_g_free0 (path);
-#line 41268 "Photo.c"
+#line 41246 "Photo.c"
}
#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_path_it);
-#line 41272 "Photo.c"
+#line 41250 "Photo.c"
}
}
#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (keywords);
#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
_hierarchical_tag_index_unref0 (new_htag_index);
-#line 41279 "Photo.c"
+#line 41257 "Photo.c"
}
@@ -41290,46 +41268,46 @@ static void library_photo_class_init (LibraryPhotoClass * klass) {
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate));
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_master_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_master_reimported;
+ ((PhotoClass *) klass)->notify_master_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_master_reimported;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_editable_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_editable_reimported;
+ ((PhotoClass *) klass)->notify_editable_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_editable_reimported;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_source_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_source_reimported;
+ ((PhotoClass *) klass)->notify_source_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_source_reimported;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->notify_baseline_reimported = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_notify_baseline_reimported;
+ ((PhotoClass *) klass)->notify_baseline_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_baseline_reimported;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) library_photo_real_notify_altered;
+ ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) library_photo_real_notify_altered;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) library_photo_real_get_preview_pixbuf;
+ ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) library_photo_real_get_preview_pixbuf;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) library_photo_real_rotate;
+ ((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) library_photo_real_rotate;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) library_photo_real_get_thumbnail;
+ ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) library_photo_real_get_thumbnail;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) library_photo_real_is_trashed;
+ ((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) library_photo_real_is_trashed;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) library_photo_real_trash;
+ ((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) library_photo_real_trash;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) library_photo_real_untrash;
+ ((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) library_photo_real_untrash;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) library_photo_real_is_offline;
+ ((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) library_photo_real_is_offline;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) library_photo_real_mark_offline;
+ ((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) library_photo_real_mark_offline;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) library_photo_real_mark_online;
+ ((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) library_photo_real_mark_online;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) library_photo_real_internal_delete_backing;
+ ((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) library_photo_real_internal_delete_backing;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) library_photo_real_destroy;
+ ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) library_photo_real_destroy;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) library_photo_real_has_user_generated_metadata;
+ ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) library_photo_real_has_user_generated_metadata;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export;
+ ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport;
+ ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (klass)->finalize = library_photo_finalize;
-#line 41328 "Photo.c"
+#line 41306 "Photo.c"
}
@@ -41337,12 +41315,12 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface);
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->is_flagged = (gboolean (*)(Flaggable*)) library_photo_real_is_flagged;
+ iface->is_flagged = (gboolean (*) (Flaggable *)) library_photo_real_is_flagged;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged;
+ iface->mark_flagged = (void (*) (Flaggable *)) library_photo_real_mark_flagged;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged;
-#line 41341 "Photo.c"
+ iface->mark_unflagged = (void (*) (Flaggable *)) library_photo_real_mark_unflagged;
+#line 41319 "Photo.c"
}
@@ -41350,16 +41328,16 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface)
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface);
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->is_offline = (gboolean (*)(Monitorable*)) library_photo_real_is_offline;
+ iface->is_offline = (gboolean (*) (Monitorable *)) library_photo_real_is_offline;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->mark_offline = (void (*)(Monitorable*)) library_photo_real_mark_offline;
+ iface->mark_offline = (void (*) (Monitorable *)) library_photo_real_mark_offline;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->mark_online = (void (*)(Monitorable*)) library_photo_real_mark_online;
+ iface->mark_online = (void (*) (Monitorable *)) library_photo_real_mark_online;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file;
+ iface->set_master_file = (void (*) (Monitorable *, GFile*)) photo_set_master_file;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
- iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp;
-#line 41358 "Photo.c"
+ iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) photo_set_master_timestamp;
+#line 41336 "Photo.c"
}
@@ -41370,11 +41348,11 @@ static void library_photo_instance_init (LibraryPhoto * self) {
self->priv->block_thumbnail_generation = FALSE;
#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->thumbnail_scheduler = NULL;
-#line 41369 "Photo.c"
+#line 41347 "Photo.c"
}
-static void library_photo_finalize (GObject* obj) {
+static void library_photo_finalize (GObject * obj) {
LibraryPhoto * self;
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -41384,7 +41362,7 @@ static void library_photo_finalize (GObject* obj) {
_g_object_unref0 (self->priv->import_keywords);
#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj);
-#line 41383 "Photo.c"
+#line 41361 "Photo.c"
}
@@ -41406,11 +41384,11 @@ GType library_photo_get_type (void) {
LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GType object_type, LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
LibraryPhotoSourceHoldingTank* self = NULL;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- SourceHoldingTankCheckToKeep _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- GetSourceDatabaseKey _tmp2_ = NULL;
- void* _tmp2__target = NULL;
+ LibraryPhotoSourceCollection* _tmp0_;
+ SourceHoldingTankCheckToKeep _tmp1_;
+ void* _tmp1__target;
+ GetSourceDatabaseKey _tmp2_;
+ void* _tmp2__target;
#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL);
#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41427,27 +41405,27 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp
self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
return self;
-#line 41426 "Photo.c"
+#line 41404 "Photo.c"
}
LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 41433 "Photo.c"
+#line 41411 "Photo.c"
}
LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPhotoSourceHoldingTank* self, GFile* file) {
LibraryPhoto* result = NULL;
LibraryPhoto* ret = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
- LibraryPhoto* _tmp3_ = NULL;
- GeeHashMap* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeHashMap* _tmp0_;
+ GFile* _tmp1_;
+ gpointer _tmp2_;
+ LibraryPhoto* _tmp3_;
+ GeeHashMap* _tmp4_;
+ GFile* _tmp5_;
+ gpointer _tmp6_;
#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL);
#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41472,7 +41450,7 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
result = ret;
#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 41471 "Photo.c"
+#line 41449 "Photo.c"
}
#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->development_file_map;
@@ -41486,30 +41464,30 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
_g_object_unref0 (ret);
#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
return result;
-#line 41485 "Photo.c"
+#line 41463 "Photo.c"
}
static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 41492 "Photo.c"
+#line 41470 "Photo.c"
}
static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender);
-#line 41499 "Photo.c"
+#line 41477 "Photo.c"
}
static void library_photo_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) {
LibraryPhotoSourceHoldingTank * self;
- GeeCollection* _tmp0_ = NULL;
- GeeCollection* _tmp40_ = NULL;
- GeeCollection* _tmp81_ = NULL;
- GeeCollection* _tmp82_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeCollection* _tmp40_;
+ GeeCollection* _tmp81_;
+ GeeCollection* _tmp82_;
#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41520,11 +41498,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_tmp0_ = added;
#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp0_ != NULL) {
-#line 41519 "Photo.c"
+#line 41497 "Photo.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeCollection* _tmp1_;
+ GeeIterator* _tmp2_;
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp1_ = added;
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41533,25 +41511,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_source_it = _tmp2_;
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41532 "Photo.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 41510 "Photo.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataSource* source = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
LibraryPhoto* photo = NULL;
- DataSource* _tmp7_ = NULL;
- LibraryPhoto* _tmp8_ = NULL;
- LibraryPhoto* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
- GFile* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ DataSource* _tmp7_;
+ LibraryPhoto* _tmp8_;
+ LibraryPhoto* _tmp9_;
+ GFile* _tmp10_;
+ GFile* _tmp11_;
+ gboolean _tmp12_;
GeeCollection* raw_files = NULL;
- LibraryPhoto* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
- GeeCollection* _tmp25_ = NULL;
- LibraryPhoto* _tmp38_ = NULL;
- LibraryPhoto* _tmp39_ = NULL;
+ LibraryPhoto* _tmp23_;
+ GeeCollection* _tmp24_;
+ GeeCollection* _tmp25_;
+ LibraryPhoto* _tmp38_;
+ LibraryPhoto* _tmp39_;
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp3_ = _source_it;
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41560,7 +41538,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
if (!_tmp4_) {
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41559 "Photo.c"
+#line 41537 "Photo.c"
}
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp5_ = _source_it;
@@ -41586,17 +41564,17 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_g_object_unref0 (_tmp11_);
#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp12_) {
-#line 41585 "Photo.c"
- GeeHashMap* _tmp13_ = NULL;
- LibraryPhoto* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
- GFile* _tmp16_ = NULL;
- LibraryPhoto* _tmp17_ = NULL;
- GeeMultiMap* _tmp18_ = NULL;
- LibraryPhoto* _tmp19_ = NULL;
- LibraryPhoto* _tmp20_ = NULL;
- GFile* _tmp21_ = NULL;
- GFile* _tmp22_ = NULL;
+#line 41563 "Photo.c"
+ GeeHashMap* _tmp13_;
+ LibraryPhoto* _tmp14_;
+ GFile* _tmp15_;
+ GFile* _tmp16_;
+ LibraryPhoto* _tmp17_;
+ GeeMultiMap* _tmp18_;
+ LibraryPhoto* _tmp19_;
+ LibraryPhoto* _tmp20_;
+ GFile* _tmp21_;
+ GFile* _tmp22_;
#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->priv->editable_file_map;
#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41625,7 +41603,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_);
#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_tmp22_);
-#line 41624 "Photo.c"
+#line 41602 "Photo.c"
}
#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = photo;
@@ -41637,11 +41615,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_tmp25_ = raw_files;
#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp25_ != NULL) {
-#line 41636 "Photo.c"
+#line 41614 "Photo.c"
{
GeeIterator* _f_it = NULL;
- GeeCollection* _tmp26_ = NULL;
- GeeIterator* _tmp27_ = NULL;
+ GeeCollection* _tmp26_;
+ GeeIterator* _tmp27_;
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp26_ = raw_files;
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41650,18 +41628,18 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_f_it = _tmp27_;
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41649 "Photo.c"
- GeeIterator* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
+#line 41627 "Photo.c"
+ GeeIterator* _tmp28_;
+ gboolean _tmp29_;
GFile* f = NULL;
- GeeIterator* _tmp30_ = NULL;
- gpointer _tmp31_ = NULL;
- GeeHashMap* _tmp32_ = NULL;
- GFile* _tmp33_ = NULL;
- LibraryPhoto* _tmp34_ = NULL;
- GeeMultiMap* _tmp35_ = NULL;
- LibraryPhoto* _tmp36_ = NULL;
- GFile* _tmp37_ = NULL;
+ GeeIterator* _tmp30_;
+ gpointer _tmp31_;
+ GeeHashMap* _tmp32_;
+ GFile* _tmp33_;
+ LibraryPhoto* _tmp34_;
+ GeeMultiMap* _tmp35_;
+ LibraryPhoto* _tmp36_;
+ GFile* _tmp37_;
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp28_ = _f_it;
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41670,7 +41648,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
if (!_tmp29_) {
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41669 "Photo.c"
+#line 41647 "Photo.c"
}
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp30_ = _f_it;
@@ -41696,11 +41674,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 41695 "Photo.c"
+#line 41673 "Photo.c"
}
#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 41699 "Photo.c"
+#line 41677 "Photo.c"
}
}
#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41717,22 +41695,22 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_g_object_unref0 (photo);
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (source);
-#line 41716 "Photo.c"
+#line 41694 "Photo.c"
}
#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_source_it);
-#line 41720 "Photo.c"
+#line 41698 "Photo.c"
}
}
#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp40_ = removed;
#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp40_ != NULL) {
-#line 41727 "Photo.c"
+#line 41705 "Photo.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp41_ = NULL;
- GeeIterator* _tmp42_ = NULL;
+ GeeCollection* _tmp41_;
+ GeeIterator* _tmp42_;
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp41_ = removed;
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41741,23 +41719,23 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_source_it = _tmp42_;
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41740 "Photo.c"
- GeeIterator* _tmp43_ = NULL;
- gboolean _tmp44_ = FALSE;
+#line 41718 "Photo.c"
+ GeeIterator* _tmp43_;
+ gboolean _tmp44_;
DataSource* source = NULL;
- GeeIterator* _tmp45_ = NULL;
- gpointer _tmp46_ = NULL;
+ GeeIterator* _tmp45_;
+ gpointer _tmp46_;
LibraryPhoto* photo = NULL;
- DataSource* _tmp47_ = NULL;
- LibraryPhoto* _tmp48_ = NULL;
- GeeMultiMap* _tmp73_ = NULL;
- LibraryPhoto* _tmp74_ = NULL;
- GeeMultiMap* _tmp75_ = NULL;
- LibraryPhoto* _tmp76_ = NULL;
- LibraryPhoto* _tmp77_ = NULL;
- guint _tmp78_ = 0U;
- LibraryPhoto* _tmp79_ = NULL;
- guint _tmp80_ = 0U;
+ DataSource* _tmp47_;
+ LibraryPhoto* _tmp48_;
+ GeeMultiMap* _tmp73_;
+ LibraryPhoto* _tmp74_;
+ GeeMultiMap* _tmp75_;
+ LibraryPhoto* _tmp76_;
+ LibraryPhoto* _tmp77_;
+ guint _tmp78_;
+ LibraryPhoto* _tmp79_;
+ guint _tmp80_;
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp43_ = _source_it;
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41766,7 +41744,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
if (!_tmp44_) {
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41765 "Photo.c"
+#line 41743 "Photo.c"
}
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp45_ = _source_it;
@@ -41780,15 +41758,15 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
photo = _tmp48_;
-#line 41779 "Photo.c"
+#line 41757 "Photo.c"
{
GeeIterator* _f_it = NULL;
- GeeMultiMap* _tmp49_ = NULL;
- LibraryPhoto* _tmp50_ = NULL;
- GeeCollection* _tmp51_ = NULL;
- GeeCollection* _tmp52_ = NULL;
- GeeIterator* _tmp53_ = NULL;
- GeeIterator* _tmp54_ = NULL;
+ GeeMultiMap* _tmp49_;
+ LibraryPhoto* _tmp50_;
+ GeeCollection* _tmp51_;
+ GeeCollection* _tmp52_;
+ GeeIterator* _tmp53_;
+ GeeIterator* _tmp54_;
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp49_ = self->priv->reverse_editable_file_map;
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41807,14 +41785,14 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_f_it = _tmp54_;
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41806 "Photo.c"
- GeeIterator* _tmp55_ = NULL;
- gboolean _tmp56_ = FALSE;
+#line 41784 "Photo.c"
+ GeeIterator* _tmp55_;
+ gboolean _tmp56_;
GFile* f = NULL;
- GeeIterator* _tmp57_ = NULL;
- gpointer _tmp58_ = NULL;
- GeeHashMap* _tmp59_ = NULL;
- GFile* _tmp60_ = NULL;
+ GeeIterator* _tmp57_;
+ gpointer _tmp58_;
+ GeeHashMap* _tmp59_;
+ GFile* _tmp60_;
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp55_ = _f_it;
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41823,7 +41801,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
if (!_tmp56_) {
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41822 "Photo.c"
+#line 41800 "Photo.c"
}
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp57_ = _f_it;
@@ -41839,20 +41817,20 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL);
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 41838 "Photo.c"
+#line 41816 "Photo.c"
}
#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 41842 "Photo.c"
+#line 41820 "Photo.c"
}
{
GeeIterator* _f_it = NULL;
- GeeMultiMap* _tmp61_ = NULL;
- LibraryPhoto* _tmp62_ = NULL;
- GeeCollection* _tmp63_ = NULL;
- GeeCollection* _tmp64_ = NULL;
- GeeIterator* _tmp65_ = NULL;
- GeeIterator* _tmp66_ = NULL;
+ GeeMultiMap* _tmp61_;
+ LibraryPhoto* _tmp62_;
+ GeeCollection* _tmp63_;
+ GeeCollection* _tmp64_;
+ GeeIterator* _tmp65_;
+ GeeIterator* _tmp66_;
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp61_ = self->priv->reverse_development_file_map;
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41871,14 +41849,14 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_f_it = _tmp66_;
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 41870 "Photo.c"
- GeeIterator* _tmp67_ = NULL;
- gboolean _tmp68_ = FALSE;
+#line 41848 "Photo.c"
+ GeeIterator* _tmp67_;
+ gboolean _tmp68_;
GFile* f = NULL;
- GeeIterator* _tmp69_ = NULL;
- gpointer _tmp70_ = NULL;
- GeeHashMap* _tmp71_ = NULL;
- GFile* _tmp72_ = NULL;
+ GeeIterator* _tmp69_;
+ gpointer _tmp70_;
+ GeeHashMap* _tmp71_;
+ GFile* _tmp72_;
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp67_ = _f_it;
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41887,7 +41865,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
if (!_tmp68_) {
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 41886 "Photo.c"
+#line 41864 "Photo.c"
}
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp69_ = _f_it;
@@ -41903,11 +41881,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL);
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 41902 "Photo.c"
+#line 41880 "Photo.c"
}
#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 41906 "Photo.c"
+#line 41884 "Photo.c"
}
#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp73_ = self->priv->reverse_editable_file_map;
@@ -41937,11 +41915,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_g_object_unref0 (photo);
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (source);
-#line 41936 "Photo.c"
+#line 41914 "Photo.c"
}
#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_source_it);
-#line 41940 "Photo.c"
+#line 41918 "Photo.c"
}
}
#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41950,20 +41928,20 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
_tmp82_ = removed;
#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_);
-#line 41949 "Photo.c"
+#line 41927 "Photo.c"
}
static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhotoSourceHoldingTank* self, Photo* _photo, GFile* old_file, GFile* new_file) {
LibraryPhoto* photo = NULL;
- Photo* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
- LibraryPhoto* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- GFile* _tmp9_ = NULL;
- GeeMultiMap* _tmp13_ = NULL;
- LibraryPhoto* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
+ Photo* _tmp0_;
+ LibraryPhoto* _tmp1_;
+ LibraryPhoto* _tmp2_;
+ GFile* _tmp3_;
+ GFile* _tmp9_;
+ GeeMultiMap* _tmp13_;
+ LibraryPhoto* _tmp14_;
+ GFile* _tmp15_;
#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41986,12 +41964,12 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
_tmp3_ = old_file;
#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp3_ != NULL) {
-#line 41985 "Photo.c"
- GeeHashMap* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
- GeeMultiMap* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
- GFile* _tmp8_ = NULL;
+#line 41963 "Photo.c"
+ GeeHashMap* _tmp4_;
+ GFile* _tmp5_;
+ GeeMultiMap* _tmp6_;
+ LibraryPhoto* _tmp7_;
+ GFile* _tmp8_;
#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp4_ = self->priv->editable_file_map;
#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42006,16 +41984,16 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
_tmp8_ = old_file;
#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_);
-#line 42005 "Photo.c"
+#line 41983 "Photo.c"
}
#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp9_ = new_file;
#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp9_ != NULL) {
-#line 42011 "Photo.c"
- GeeHashMap* _tmp10_ = NULL;
- GFile* _tmp11_ = NULL;
- LibraryPhoto* _tmp12_ = NULL;
+#line 41989 "Photo.c"
+ GeeHashMap* _tmp10_;
+ GFile* _tmp11_;
+ LibraryPhoto* _tmp12_;
#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp10_ = self->priv->editable_file_map;
#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42024,7 +42002,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
_tmp12_ = photo;
#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
-#line 42023 "Photo.c"
+#line 42001 "Photo.c"
}
#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp13_ = self->priv->reverse_editable_file_map;
@@ -42036,22 +42014,22 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_);
#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 42035 "Photo.c"
+#line 42013 "Photo.c"
}
static void library_photo_source_holding_tank_on_raw_development_modified (LibraryPhotoSourceHoldingTank* self, Photo* _photo) {
LibraryPhoto* photo = NULL;
- Photo* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
- LibraryPhoto* _tmp2_ = NULL;
- GeeMultiMap* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ Photo* _tmp0_;
+ LibraryPhoto* _tmp1_;
+ LibraryPhoto* _tmp2_;
+ GeeMultiMap* _tmp3_;
+ LibraryPhoto* _tmp4_;
+ gboolean _tmp5_;
GeeCollection* raw_list = NULL;
- LibraryPhoto* _tmp20_ = NULL;
- GeeCollection* _tmp21_ = NULL;
- GeeCollection* _tmp22_ = NULL;
+ LibraryPhoto* _tmp20_;
+ GeeCollection* _tmp21_;
+ GeeCollection* _tmp22_;
#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42074,17 +42052,17 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp5_) {
-#line 42073 "Photo.c"
- GeeMultiMap* _tmp18_ = NULL;
- LibraryPhoto* _tmp19_ = NULL;
+#line 42051 "Photo.c"
+ GeeMultiMap* _tmp18_;
+ LibraryPhoto* _tmp19_;
{
GeeIterator* _f_it = NULL;
- GeeMultiMap* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
+ GeeMultiMap* _tmp6_;
+ LibraryPhoto* _tmp7_;
+ GeeCollection* _tmp8_;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
+ GeeIterator* _tmp11_;
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp6_ = self->priv->reverse_development_file_map;
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42103,14 +42081,14 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
_f_it = _tmp11_;
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 42102 "Photo.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 42080 "Photo.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
GFile* f = NULL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- GeeHashMap* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
+ GeeHashMap* _tmp16_;
+ GFile* _tmp17_;
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp12_ = _f_it;
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42119,7 +42097,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
if (!_tmp13_) {
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 42118 "Photo.c"
+#line 42096 "Photo.c"
}
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp14_ = _f_it;
@@ -42135,11 +42113,11 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 42134 "Photo.c"
+#line 42112 "Photo.c"
}
#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 42138 "Photo.c"
+#line 42116 "Photo.c"
}
#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp18_ = self->priv->reverse_development_file_map;
@@ -42147,7 +42125,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
_tmp19_ = photo;
#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
gee_multi_map_remove_all (_tmp18_, _tmp19_);
-#line 42146 "Photo.c"
+#line 42124 "Photo.c"
}
#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp20_ = photo;
@@ -42159,11 +42137,11 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
_tmp22_ = raw_list;
#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
if (_tmp22_ != NULL) {
-#line 42158 "Photo.c"
+#line 42136 "Photo.c"
{
GeeIterator* _f_it = NULL;
- GeeCollection* _tmp23_ = NULL;
- GeeIterator* _tmp24_ = NULL;
+ GeeCollection* _tmp23_;
+ GeeIterator* _tmp24_;
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp23_ = raw_list;
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42172,18 +42150,18 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
_f_it = _tmp24_;
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
while (TRUE) {
-#line 42171 "Photo.c"
- GeeIterator* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
+#line 42149 "Photo.c"
+ GeeIterator* _tmp25_;
+ gboolean _tmp26_;
GFile* f = NULL;
- GeeIterator* _tmp27_ = NULL;
- gpointer _tmp28_ = NULL;
- GeeHashMap* _tmp29_ = NULL;
- GFile* _tmp30_ = NULL;
- LibraryPhoto* _tmp31_ = NULL;
- GeeMultiMap* _tmp32_ = NULL;
- LibraryPhoto* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
+ GeeIterator* _tmp27_;
+ gpointer _tmp28_;
+ GeeHashMap* _tmp29_;
+ GFile* _tmp30_;
+ LibraryPhoto* _tmp31_;
+ GeeMultiMap* _tmp32_;
+ LibraryPhoto* _tmp33_;
+ GFile* _tmp34_;
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp25_ = _f_it;
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42192,7 +42170,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
if (!_tmp26_) {
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
break;
-#line 42191 "Photo.c"
+#line 42169 "Photo.c"
}
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
_tmp27_ = _f_it;
@@ -42218,18 +42196,18 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_);
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (f);
-#line 42217 "Photo.c"
+#line 42195 "Photo.c"
}
#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (_f_it);
-#line 42221 "Photo.c"
+#line 42199 "Photo.c"
}
}
#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (raw_list);
#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
_g_object_unref0 (photo);
-#line 42228 "Photo.c"
+#line 42206 "Photo.c"
}
@@ -42241,16 +42219,16 @@ static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHold
#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate));
#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
- ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42241 "Photo.c"
+ ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered;
+#line 42219 "Photo.c"
}
static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceHoldingTank * self) {
- GeeHashMap* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- GeeHashMultiMap* _tmp2_ = NULL;
- GeeHashMultiMap* _tmp3_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeHashMap* _tmp1_;
+ GeeHashMultiMap* _tmp2_;
+ GeeHashMultiMap* _tmp3_;
#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42269,11 +42247,11 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 42268 "Photo.c"
+#line 42246 "Photo.c"
}
-static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj) {
+static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) {
LibraryPhotoSourceHoldingTank * self;
#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
@@ -42287,7 +42265,7 @@ static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj)
_g_object_unref0 (self->priv->reverse_development_file_map);
#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj);
-#line 42286 "Photo.c"
+#line 42264 "Photo.c"
}