diff options
Diffstat (limited to 'src/MetadataWriter.c')
-rw-r--r-- | src/MetadataWriter.c | 1941 |
1 files changed, 973 insertions, 968 deletions
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c index 1a9aeea..555f600 100644 --- a/src/MetadataWriter.c +++ b/src/MetadataWriter.c @@ -1,4 +1,4 @@ -/* MetadataWriter.c generated by valac 0.34.7, the Vala compiler +/* MetadataWriter.c generated by valac 0.36.6, the Vala compiler * generated from MetadataWriter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -415,6 +415,11 @@ typedef struct _MetadataDateTimeClass MetadataDateTimeClass; #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL))) #define TYPE_ORIENTATION (orientation_get_type ()) +enum { + METADATA_WRITER_PROGRESS_SIGNAL, + METADATA_WRITER_LAST_SIGNAL +}; +static guint metadata_writer_signals[METADATA_WRITER_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -775,11 +780,11 @@ GType photo_metadata_get_type (void) G_GNUC_CONST; PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error); static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommitJob* self, PhotoMetadata* metadata, gboolean skip_orientation); void library_monitor_blacklist_file (GFile* file, const gchar* reason); -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 library_monitor_unblacklist_file (GFile* file); PhotoFileFormat* photo_get_editable_file_format (Photo* self); PhotoMetadata* photo_get_editable_metadata (Photo* self, 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); gchar* media_source_get_title (MediaSource* self); gchar* media_metadata_get_title (MediaMetadata* self); GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; @@ -816,143 +821,143 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version); #define RESOURCES_APP_TITLE "Shotwell" #define RESOURCES_APP_VERSION _VERSION -static void metadata_writer_commit_job_finalize (BackgroundJob* obj); -static void metadata_writer_finalize (GObject* obj); +static void metadata_writer_commit_job_finalize (BackgroundJob * obj); +static void metadata_writer_finalize (GObject * obj); static const gchar* METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS[4] = {"name", "comment", "rating", "exposure-time"}; static void _metadata_writer_on_config_changed_configuration_facade_commit_metadata_to_masters_changed (ConfigurationFacade* _sender, gpointer self) { #line 220 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_config_changed ((MetadataWriter*) self); -#line 828 "MetadataWriter.c" +#line 833 "MetadataWriter.c" } static void _metadata_writer_on_importing_photos_media_source_collection_media_import_starting (MediaSourceCollection* _sender, GeeCollection* media, gpointer self) { #line 222 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_importing_photos ((MetadataWriter*) self, media); -#line 835 "MetadataWriter.c" +#line 840 "MetadataWriter.c" } static void _metadata_writer_on_photos_imported_media_source_collection_media_import_completed (MediaSourceCollection* _sender, GeeCollection* media, gpointer self) { #line 223 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_imported ((MetadataWriter*) self, media); -#line 842 "MetadataWriter.c" +#line 847 "MetadataWriter.c" } static void _metadata_writer_on_photos_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { #line 224 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_added_removed ((MetadataWriter*) self, added, removed); -#line 849 "MetadataWriter.c" +#line 854 "MetadataWriter.c" } static void _metadata_writer_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 225 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_altered ((MetadataWriter*) self, items); -#line 856 "MetadataWriter.c" +#line 861 "MetadataWriter.c" } static void _metadata_writer_on_collection_frozen_data_collection_frozen (DataCollection* _sender, gpointer self) { #line 226 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_collection_frozen ((MetadataWriter*) self); -#line 863 "MetadataWriter.c" +#line 868 "MetadataWriter.c" } static void _metadata_writer_on_collection_thawed_data_collection_thawed (DataCollection* _sender, gpointer self) { #line 227 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_collection_thawed ((MetadataWriter*) self); -#line 870 "MetadataWriter.c" +#line 875 "MetadataWriter.c" } static void _metadata_writer_on_photos_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) { #line 228 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photos_destroyed ((MetadataWriter*) self, destroyed); -#line 877 "MetadataWriter.c" +#line 882 "MetadataWriter.c" } static void _metadata_writer_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 230 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_tags_altered ((MetadataWriter*) self, items); -#line 884 "MetadataWriter.c" +#line 889 "MetadataWriter.c" } static void _metadata_writer_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self) { #line 231 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_tag_contents_altered ((MetadataWriter*) self, container, added, relinked, removed, unlinked); -#line 891 "MetadataWriter.c" +#line 896 "MetadataWriter.c" } static void _metadata_writer_on_tag_backlink_removed_container_source_collection_backlink_to_container_removed (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* sources, gpointer self) { #line 232 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_tag_backlink_removed ((MetadataWriter*) self, container, sources); -#line 898 "MetadataWriter.c" +#line 903 "MetadataWriter.c" } static void _metadata_writer_on_application_exiting_application_exiting (Application* _sender, gboolean panicked, gpointer self) { #line 236 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_application_exiting ((MetadataWriter*) self); -#line 905 "MetadataWriter.c" +#line 910 "MetadataWriter.c" } static void _metadata_writer_on_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { #line 238 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_monitor_installed ((MetadataWriter*) self, monitor); -#line 912 "MetadataWriter.c" +#line 917 "MetadataWriter.c" } static void _metadata_writer_on_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { #line 239 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_monitor_destroyed ((MetadataWriter*) self, monitor); -#line 919 "MetadataWriter.c" +#line 924 "MetadataWriter.c" } static void _metadata_writer_on_photo_dequeued_dequeued_callback (gconstpointer item, gpointer self) { #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_photo_dequeued ((MetadataWriter*) self, (LibraryPhoto*) item); -#line 926 "MetadataWriter.c" +#line 931 "MetadataWriter.c" } static MetadataWriter* metadata_writer_construct (GType object_type) { MetadataWriter * self = NULL; - HashTimedQueue* _tmp0_ = NULL; - HashTimedQueue* _tmp1_ = NULL; - ConfigFacade* _tmp5_ = NULL; - ConfigFacade* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - ConfigFacade* _tmp8_ = NULL; - ConfigFacade* _tmp9_ = NULL; - LibraryPhotoSourceCollection* _tmp10_ = NULL; - LibraryPhotoSourceCollection* _tmp11_ = NULL; - LibraryPhotoSourceCollection* _tmp12_ = NULL; - LibraryPhotoSourceCollection* _tmp13_ = NULL; - LibraryPhotoSourceCollection* _tmp14_ = NULL; - LibraryPhotoSourceCollection* _tmp15_ = NULL; - LibraryPhotoSourceCollection* _tmp16_ = NULL; - TagSourceCollection* _tmp17_ = NULL; - TagSourceCollection* _tmp18_ = NULL; - TagSourceCollection* _tmp19_ = NULL; - TagSourceCollection* _tmp20_ = NULL; - TagSourceCollection* _tmp21_ = NULL; - Application* _tmp22_ = NULL; - Application* _tmp23_ = NULL; - LibraryMonitorPool* _tmp24_ = NULL; - LibraryMonitorPool* _tmp25_ = NULL; - LibraryMonitorPool* _tmp26_ = NULL; - LibraryMonitorPool* _tmp27_ = NULL; + HashTimedQueue* _tmp0_; + HashTimedQueue* _tmp1_; + ConfigFacade* _tmp5_; + ConfigFacade* _tmp6_; + gboolean _tmp7_; + ConfigFacade* _tmp8_; + ConfigFacade* _tmp9_; + LibraryPhotoSourceCollection* _tmp10_; + LibraryPhotoSourceCollection* _tmp11_; + LibraryPhotoSourceCollection* _tmp12_; + LibraryPhotoSourceCollection* _tmp13_; + LibraryPhotoSourceCollection* _tmp14_; + LibraryPhotoSourceCollection* _tmp15_; + LibraryPhotoSourceCollection* _tmp16_; + TagSourceCollection* _tmp17_; + TagSourceCollection* _tmp18_; + TagSourceCollection* _tmp19_; + TagSourceCollection* _tmp20_; + TagSourceCollection* _tmp21_; + Application* _tmp22_; + Application* _tmp23_; + LibraryMonitorPool* _tmp24_; + LibraryMonitorPool* _tmp25_; + LibraryMonitorPool* _tmp26_; + LibraryMonitorPool* _tmp27_; #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = (MetadataWriter*) g_object_new (object_type, NULL); #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -967,7 +972,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { timed_queue_set_dequeue_spacing_msec (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TIMED_QUEUE, TimedQueue), METADATA_WRITER_COMMIT_SPACING_MSEC); #line 186 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_pause (self); -#line 971 "MetadataWriter.c" +#line 976 "MetadataWriter.c" { const gchar** detail_collection = NULL; gint detail_collection_length1 = 0; @@ -979,17 +984,17 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { detail_collection_length1 = G_N_ELEMENTS (METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS); #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" for (detail_it = 0; detail_it < G_N_ELEMENTS (METADATA_WRITER_INTERESTED_PHOTO_METADATA_DETAILS); detail_it = detail_it + 1) { -#line 983 "MetadataWriter.c" - gchar* _tmp2_ = NULL; +#line 988 "MetadataWriter.c" + gchar* _tmp2_; gchar* detail = NULL; #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = g_strdup (detail_collection[detail_it]); #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" detail = _tmp2_; -#line 990 "MetadataWriter.c" +#line 995 "MetadataWriter.c" { - GeeHashSet* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GeeHashSet* _tmp3_; + const gchar* _tmp4_; #line 190 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = self->priv->interested_photo_details; #line 190 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -998,7 +1003,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_); #line 189 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (detail); -#line 1002 "MetadataWriter.c" +#line 1007 "MetadataWriter.c" } } } @@ -1096,62 +1101,62 @@ static MetadataWriter* metadata_writer_construct (GType object_type) { _library_monitor_pool_unref0 (_tmp27_); #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self; -#line 1100 "MetadataWriter.c" +#line 1105 "MetadataWriter.c" } static MetadataWriter* metadata_writer_new (void) { #line 179 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return metadata_writer_construct (TYPE_METADATA_WRITER); -#line 1107 "MetadataWriter.c" +#line 1112 "MetadataWriter.c" } void metadata_writer_init (void) { - MetadataWriter* _tmp0_ = NULL; + MetadataWriter* _tmp0_; #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = metadata_writer_new (); #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (metadata_writer_instance); #line 243 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_instance = _tmp0_; -#line 1119 "MetadataWriter.c" +#line 1124 "MetadataWriter.c" } void metadata_writer_terminate (void) { - MetadataWriter* _tmp0_ = NULL; + MetadataWriter* _tmp0_; #line 247 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = metadata_writer_instance; #line 247 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_ != NULL) { -#line 1129 "MetadataWriter.c" - MetadataWriter* _tmp1_ = NULL; +#line 1134 "MetadataWriter.c" + MetadataWriter* _tmp1_; #line 248 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = metadata_writer_instance; #line 248 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_close (_tmp1_); -#line 1135 "MetadataWriter.c" +#line 1140 "MetadataWriter.c" } #line 250 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (metadata_writer_instance); #line 250 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_instance = NULL; -#line 1141 "MetadataWriter.c" +#line 1146 "MetadataWriter.c" } static gpointer _g_object_ref0 (gpointer self) { #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self ? g_object_ref (self) : NULL; -#line 1148 "MetadataWriter.c" +#line 1153 "MetadataWriter.c" } MetadataWriter* metadata_writer_get_instance (void) { MetadataWriter* result = NULL; - MetadataWriter* _tmp0_ = NULL; - MetadataWriter* _tmp1_ = NULL; + MetadataWriter* _tmp0_; + MetadataWriter* _tmp1_; #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = metadata_writer_instance; #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1160,14 +1165,14 @@ MetadataWriter* metadata_writer_get_instance (void) { result = _tmp1_; #line 254 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return result; -#line 1164 "MetadataWriter.c" +#line 1169 "MetadataWriter.c" } void metadata_writer_force_rescan (MetadataWriter* self) { - LibraryPhotoSourceCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; + LibraryPhotoSourceCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; #line 258 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 259 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1180,13 +1185,13 @@ void metadata_writer_force_rescan (MetadataWriter* self) { metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), "force rescan"); #line 259 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp2_); -#line 1184 "MetadataWriter.c" +#line 1189 "MetadataWriter.c" } void metadata_writer_pause (MetadataWriter* self) { - gint _tmp0_ = 0; - HashTimedQueue* _tmp1_ = NULL; + gint _tmp0_; + HashTimedQueue* _tmp1_; #line 262 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 263 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1197,22 +1202,22 @@ void metadata_writer_pause (MetadataWriter* self) { if (_tmp0_ != 0) { #line 264 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1201 "MetadataWriter.c" +#line 1206 "MetadataWriter.c" } #line 266 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = self->priv->dirty; #line 266 "/home/jens/Source/shotwell/src/MetadataWriter.vala" timed_queue_pause (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TIMED_QUEUE, TimedQueue)); #line 268 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit_by_name (self, "progress", (guint) 0, (guint) 0); -#line 1209 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, (guint) 0, (guint) 0); +#line 1214 "MetadataWriter.c" } void metadata_writer_unpause (MetadataWriter* self) { gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - HashTimedQueue* _tmp4_ = NULL; + gint _tmp1_; + HashTimedQueue* _tmp4_; #line 271 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1221,10 +1226,10 @@ void metadata_writer_unpause (MetadataWriter* self) { if (_tmp1_ == 0) { #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = TRUE; -#line 1225 "MetadataWriter.c" +#line 1230 "MetadataWriter.c" } else { - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = self->priv->pause_count; #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1233,24 +1238,24 @@ void metadata_writer_unpause (MetadataWriter* self) { _tmp3_ = self->priv->pause_count; #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = _tmp3_ != 0; -#line 1237 "MetadataWriter.c" +#line 1242 "MetadataWriter.c" } #line 272 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_) { #line 273 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1243 "MetadataWriter.c" +#line 1248 "MetadataWriter.c" } #line 275 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = self->priv->dirty; #line 275 "/home/jens/Source/shotwell/src/MetadataWriter.vala" timed_queue_unpause (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TIMED_QUEUE, TimedQueue)); -#line 1249 "MetadataWriter.c" +#line 1254 "MetadataWriter.c" } void metadata_writer_close (MetadataWriter* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 278 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 279 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1259,26 +1264,26 @@ void metadata_writer_close (MetadataWriter* self) { if (_tmp0_) { #line 280 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1263 "MetadataWriter.c" +#line 1268 "MetadataWriter.c" } #line 282 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_cancel_all (self, TRUE); #line 284 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->closed = TRUE; -#line 1269 "MetadataWriter.c" +#line 1274 "MetadataWriter.c" } static void metadata_writer_on_config_changed (MetadataWriter* self) { gboolean value = FALSE; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; #line 287 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 288 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1301,7 +1306,7 @@ static void metadata_writer_on_config_changed (MetadataWriter* self) { if (_tmp4_ == _tmp5_) { #line 291 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 1305 "MetadataWriter.c" +#line 1310 "MetadataWriter.c" } #line 293 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = value; @@ -1313,11 +1318,11 @@ static void metadata_writer_on_config_changed (MetadataWriter* self) { if (_tmp7_) { #line 295 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_force_rescan (self); -#line 1317 "MetadataWriter.c" +#line 1322 "MetadataWriter.c" } else { #line 297 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_cancel_all (self, FALSE); -#line 1321 "MetadataWriter.c" +#line 1326 "MetadataWriter.c" } } @@ -1327,19 +1332,19 @@ static void metadata_writer_on_application_exiting (MetadataWriter* self) { g_return_if_fail (IS_METADATA_WRITER (self)); #line 301 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_close (self); -#line 1331 "MetadataWriter.c" +#line 1336 "MetadataWriter.c" } static void _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { #line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_discovery_completed ((MetadataWriter*) self); -#line 1338 "MetadataWriter.c" +#line 1343 "MetadataWriter.c" } static void metadata_writer_on_monitor_installed (MetadataWriter* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_ = NULL; + LibraryMonitor* _tmp0_; #line 304 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 304 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1348,13 +1353,13 @@ static void metadata_writer_on_monitor_installed (MetadataWriter* self, LibraryM _tmp0_ = monitor; #line 305 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self, 0); -#line 1352 "MetadataWriter.c" +#line 1357 "MetadataWriter.c" } static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, LibraryMonitor* monitor) { - LibraryMonitor* _tmp0_ = NULL; - guint _tmp1_ = 0U; + LibraryMonitor* _tmp0_; + guint _tmp1_; #line 308 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 308 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1365,7 +1370,7 @@ static void metadata_writer_on_monitor_destroyed (MetadataWriter* self, LibraryM g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp1_, NULL, FALSE); #line 309 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _metadata_writer_on_discovery_completed_directory_monitor_discovery_completed, self); -#line 1369 "MetadataWriter.c" +#line 1374 "MetadataWriter.c" } @@ -1374,7 +1379,7 @@ static void metadata_writer_on_discovery_completed (MetadataWriter* self) { g_return_if_fail (IS_METADATA_WRITER (self)); #line 313 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_unpause (self); -#line 1378 "MetadataWriter.c" +#line 1383 "MetadataWriter.c" } @@ -1383,7 +1388,7 @@ static void metadata_writer_on_collection_frozen (MetadataWriter* self) { g_return_if_fail (IS_METADATA_WRITER (self)); #line 317 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_pause (self); -#line 1387 "MetadataWriter.c" +#line 1392 "MetadataWriter.c" } @@ -1392,13 +1397,13 @@ static void metadata_writer_on_collection_thawed (MetadataWriter* self) { g_return_if_fail (IS_METADATA_WRITER (self)); #line 321 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_unpause (self); -#line 1396 "MetadataWriter.c" +#line 1401 "MetadataWriter.c" } static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollection* media_sources) { - GeeHashSet* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeCollection* _tmp1_; #line 324 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 324 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1409,13 +1414,13 @@ static void metadata_writer_on_importing_photos (MetadataWriter* self, GeeCollec _tmp1_ = media_sources; #line 325 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1413 "MetadataWriter.c" +#line 1418 "MetadataWriter.c" } static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollection* media_sources) { - GeeHashSet* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GeeCollection* _tmp1_; #line 328 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 328 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1426,14 +1431,14 @@ static void metadata_writer_on_photos_imported (MetadataWriter* self, GeeCollect _tmp1_ = media_sources; #line 329 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1430 "MetadataWriter.c" +#line 1435 "MetadataWriter.c" } static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIterable* added, GeeIterable* removed) { gboolean _tmp0_ = FALSE; - GeeIterable* _tmp1_ = NULL; - GeeIterable* _tmp4_ = NULL; + GeeIterable* _tmp1_; + GeeIterable* _tmp4_; #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 332 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1444,42 +1449,42 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt _tmp1_ = added; #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp1_ != NULL) { -#line 1448 "MetadataWriter.c" - gboolean _tmp2_ = FALSE; +#line 1453 "MetadataWriter.c" + gboolean _tmp2_; #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = self->priv->enabled; #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = _tmp2_; -#line 1454 "MetadataWriter.c" +#line 1459 "MetadataWriter.c" } else { #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = FALSE; -#line 1458 "MetadataWriter.c" +#line 1463 "MetadataWriter.c" } #line 335 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_) { -#line 1462 "MetadataWriter.c" - GeeIterable* _tmp3_ = NULL; +#line 1467 "MetadataWriter.c" + GeeIterable* _tmp3_; #line 336 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = added; #line 336 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_schedule_if_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable), "added to LibraryPhoto.global"); -#line 1468 "MetadataWriter.c" +#line 1473 "MetadataWriter.c" } #line 339 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = removed; #line 339 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp4_ != NULL) { -#line 1474 "MetadataWriter.c" +#line 1479 "MetadataWriter.c" gboolean cancelled = FALSE; - gboolean _tmp15_ = FALSE; + gboolean _tmp15_; #line 340 "/home/jens/Source/shotwell/src/MetadataWriter.vala" cancelled = FALSE; -#line 1479 "MetadataWriter.c" +#line 1484 "MetadataWriter.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + GeeIterable* _tmp5_; + GeeIterator* _tmp6_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = removed; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1488,15 +1493,15 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt _object_it = _tmp6_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1492 "MetadataWriter.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 1497 "MetadataWriter.c" + GeeIterator* _tmp7_; + gboolean _tmp8_; DataObject* object = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; gboolean _tmp11_ = FALSE; - DataObject* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + DataObject* _tmp12_; + gboolean _tmp13_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = _object_it; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1505,7 +1510,7 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt if (!_tmp8_) { #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1509 "MetadataWriter.c" +#line 1514 "MetadataWriter.c" } #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp9_ = _object_it; @@ -1521,39 +1526,39 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt if (_tmp13_) { #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp11_ = TRUE; -#line 1525 "MetadataWriter.c" +#line 1530 "MetadataWriter.c" } else { - gboolean _tmp14_ = FALSE; + gboolean _tmp14_; #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = cancelled; #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp11_ = _tmp14_; -#line 1532 "MetadataWriter.c" +#line 1537 "MetadataWriter.c" } #line 342 "/home/jens/Source/shotwell/src/MetadataWriter.vala" cancelled = _tmp11_; #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); -#line 1538 "MetadataWriter.c" +#line 1543 "MetadataWriter.c" } #line 341 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_object_it); -#line 1542 "MetadataWriter.c" +#line 1547 "MetadataWriter.c" } #line 344 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp15_ = cancelled; #line 344 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp15_) { -#line 1548 "MetadataWriter.c" - guint _tmp16_ = 0U; - guint _tmp17_ = 0U; +#line 1553 "MetadataWriter.c" + guint _tmp16_; + guint _tmp17_; #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = self->priv->outstanding_completed; #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp17_ = self->priv->outstanding_total; #line 345 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit_by_name (self, "progress", _tmp16_, _tmp17_); -#line 1557 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp16_, _tmp17_); +#line 1562 "MetadataWriter.c" } } } @@ -1561,22 +1566,22 @@ static void metadata_writer_on_photos_added_removed (MetadataWriter* self, GeeIt static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* items) { GeeHashSet* photos = NULL; - GeeHashSet* _tmp39_ = NULL; + GeeHashSet* _tmp39_; #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (GEE_IS_MAP (items)); #line 350 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = NULL; -#line 1572 "MetadataWriter.c" +#line 1577 "MetadataWriter.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 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = items; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1595,27 +1600,27 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _object_it = _tmp5_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1599 "MetadataWriter.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 1604 "MetadataWriter.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; LibraryPhoto* photo = NULL; - DataObject* _tmp10_ = NULL; - LibraryPhoto* _tmp11_ = NULL; - LibraryPhoto* _tmp12_ = NULL; - LibraryPhoto* _tmp13_ = NULL; + DataObject* _tmp10_; + LibraryPhoto* _tmp11_; + LibraryPhoto* _tmp12_; + LibraryPhoto* _tmp13_; Alteration* alteration = NULL; - GeeMap* _tmp14_ = NULL; - DataObject* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; - Alteration* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + GeeMap* _tmp14_; + DataObject* _tmp15_; + gpointer _tmp16_; + Alteration* _tmp17_; + gboolean _tmp18_; GeeCollection* details = NULL; - Alteration* _tmp23_ = NULL; - GeeCollection* _tmp24_ = NULL; - GeeCollection* _tmp25_ = NULL; + Alteration* _tmp23_; + GeeCollection* _tmp24_; + GeeCollection* _tmp25_; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = _object_it; #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1624,7 +1629,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite if (!_tmp7_) { #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1628 "MetadataWriter.c" +#line 1633 "MetadataWriter.c" } #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp8_ = _object_it; @@ -1650,7 +1655,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (object); #line 357 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 1654 "MetadataWriter.c" +#line 1659 "MetadataWriter.c" } #line 359 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = items; @@ -1666,23 +1671,23 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _tmp18_ = alteration_has_detail (_tmp17_, "image", "orientation"); #line 362 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp18_) { -#line 1670 "MetadataWriter.c" - GeeHashSet* _tmp19_ = NULL; - GeeHashSet* _tmp21_ = NULL; - LibraryPhoto* _tmp22_ = NULL; +#line 1675 "MetadataWriter.c" + GeeHashSet* _tmp19_; + GeeHashSet* _tmp21_; + LibraryPhoto* _tmp22_; #line 363 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp19_ = photos; #line 363 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp19_ == NULL) { -#line 1678 "MetadataWriter.c" - GeeHashSet* _tmp20_ = NULL; +#line 1683 "MetadataWriter.c" + GeeHashSet* _tmp20_; #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp20_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = _tmp20_; -#line 1686 "MetadataWriter.c" +#line 1691 "MetadataWriter.c" } #line 366 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp21_ = photos; @@ -1698,7 +1703,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (object); #line 368 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 1702 "MetadataWriter.c" +#line 1707 "MetadataWriter.c" } #line 372 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp23_ = alteration; @@ -1720,12 +1725,12 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (object); #line 374 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 1724 "MetadataWriter.c" +#line 1729 "MetadataWriter.c" } { GeeIterator* _detail_it = NULL; - GeeCollection* _tmp26_ = NULL; - GeeIterator* _tmp27_ = NULL; + GeeCollection* _tmp26_; + GeeIterator* _tmp27_; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp26_ = details; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1734,15 +1739,15 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _detail_it = _tmp27_; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1738 "MetadataWriter.c" - GeeIterator* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; +#line 1743 "MetadataWriter.c" + GeeIterator* _tmp28_; + gboolean _tmp29_; gchar* detail = NULL; - GeeIterator* _tmp30_ = NULL; - gpointer _tmp31_ = NULL; - GeeHashSet* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - gboolean _tmp34_ = FALSE; + GeeIterator* _tmp30_; + gpointer _tmp31_; + GeeHashSet* _tmp32_; + const gchar* _tmp33_; + gboolean _tmp34_; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp28_ = _detail_it; #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1751,7 +1756,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite if (!_tmp29_) { #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1755 "MetadataWriter.c" +#line 1760 "MetadataWriter.c" } #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp30_ = _detail_it; @@ -1767,23 +1772,23 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _tmp34_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp33_); #line 378 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp34_) { -#line 1771 "MetadataWriter.c" - GeeHashSet* _tmp35_ = NULL; - GeeHashSet* _tmp37_ = NULL; - LibraryPhoto* _tmp38_ = NULL; +#line 1776 "MetadataWriter.c" + GeeHashSet* _tmp35_; + GeeHashSet* _tmp37_; + LibraryPhoto* _tmp38_; #line 379 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp35_ = photos; #line 379 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp35_ == NULL) { -#line 1779 "MetadataWriter.c" - GeeHashSet* _tmp36_ = NULL; +#line 1784 "MetadataWriter.c" + GeeHashSet* _tmp36_; #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp36_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = _tmp36_; -#line 1787 "MetadataWriter.c" +#line 1792 "MetadataWriter.c" } #line 382 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp37_ = photos; @@ -1795,15 +1800,15 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_free0 (detail); #line 384 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1799 "MetadataWriter.c" +#line 1804 "MetadataWriter.c" } #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (detail); -#line 1803 "MetadataWriter.c" +#line 1808 "MetadataWriter.c" } #line 377 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_detail_it); -#line 1807 "MetadataWriter.c" +#line 1812 "MetadataWriter.c" } #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (details); @@ -1813,27 +1818,27 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite _g_object_unref0 (photo); #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); -#line 1817 "MetadataWriter.c" +#line 1822 "MetadataWriter.c" } #line 351 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_object_it); -#line 1821 "MetadataWriter.c" +#line 1826 "MetadataWriter.c" } #line 389 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp39_ = photos; #line 389 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp39_ != NULL) { -#line 1827 "MetadataWriter.c" - GeeHashSet* _tmp40_ = NULL; +#line 1832 "MetadataWriter.c" + GeeHashSet* _tmp40_; #line 390 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp40_ = photos; #line 390 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), "alteration", FALSE); -#line 1833 "MetadataWriter.c" +#line 1838 "MetadataWriter.c" } #line 349 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 1837 "MetadataWriter.c" +#line 1842 "MetadataWriter.c" } @@ -1842,11 +1847,11 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec g_return_if_fail (IS_METADATA_WRITER (self)); #line 393 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (GEE_IS_COLLECTION (destroyed)); -#line 1846 "MetadataWriter.c" +#line 1851 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = destroyed; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1855,18 +1860,18 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec _source_it = _tmp1_; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1859 "MetadataWriter.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 1864 "MetadataWriter.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataSource* source = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; LibraryPhoto* photo = NULL; - DataSource* _tmp6_ = NULL; - LibraryPhoto* _tmp7_ = NULL; - LibraryPhoto* _tmp8_ = NULL; - GeeHashSet* _tmp9_ = NULL; - LibraryPhoto* _tmp10_ = NULL; + DataSource* _tmp6_; + LibraryPhoto* _tmp7_; + LibraryPhoto* _tmp8_; + GeeHashSet* _tmp9_; + LibraryPhoto* _tmp10_; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = _source_it; #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1875,7 +1880,7 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec if (!_tmp3_) { #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1879 "MetadataWriter.c" +#line 1884 "MetadataWriter.c" } #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = _source_it; @@ -1903,33 +1908,33 @@ static void metadata_writer_on_photos_destroyed (MetadataWriter* self, GeeCollec _g_object_unref0 (photo); #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 1907 "MetadataWriter.c" +#line 1912 "MetadataWriter.c" } #line 394 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 1911 "MetadataWriter.c" +#line 1916 "MetadataWriter.c" } } static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) { GeeHashSet* photos = NULL; - GeeHashSet* _tmp32_ = NULL; + GeeHashSet* _tmp32_; #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 402 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = NULL; -#line 1925 "MetadataWriter.c" +#line 1930 "MetadataWriter.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 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = map; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1948,19 +1953,19 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) _object_it = _tmp5_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 1952 "MetadataWriter.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 1957 "MetadataWriter.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeMap* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - Alteration* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - GeeHashSet* _tmp16_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GeeMap* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; + Alteration* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; + GeeHashSet* _tmp16_; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = _object_it; #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -1969,7 +1974,7 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) if (!_tmp7_) { #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 1973 "MetadataWriter.c" +#line 1978 "MetadataWriter.c" } #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp8_ = _object_it; @@ -1997,29 +2002,29 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) _g_object_unref0 (object); #line 405 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 2001 "MetadataWriter.c" +#line 2006 "MetadataWriter.c" } #line 407 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = photos; #line 407 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp16_ == NULL) { -#line 2007 "MetadataWriter.c" - GeeHashSet* _tmp17_ = NULL; +#line 2012 "MetadataWriter.c" + GeeHashSet* _tmp17_; #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp17_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = _tmp17_; -#line 2015 "MetadataWriter.c" +#line 2020 "MetadataWriter.c" } { GeeIterator* _media_it = NULL; - DataObject* _tmp18_ = NULL; - GeeCollection* _tmp19_ = NULL; - GeeCollection* _tmp20_ = NULL; - GeeIterator* _tmp21_ = NULL; - GeeIterator* _tmp22_ = NULL; + DataObject* _tmp18_; + GeeCollection* _tmp19_; + GeeCollection* _tmp20_; + GeeIterator* _tmp21_; + GeeIterator* _tmp22_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp18_ = object; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2036,16 +2041,16 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) _media_it = _tmp22_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2040 "MetadataWriter.c" - GeeIterator* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; +#line 2045 "MetadataWriter.c" + GeeIterator* _tmp23_; + gboolean _tmp24_; MediaSource* media = NULL; - GeeIterator* _tmp25_ = NULL; - gpointer _tmp26_ = NULL; + GeeIterator* _tmp25_; + gpointer _tmp26_; LibraryPhoto* photo = NULL; - MediaSource* _tmp27_ = NULL; - LibraryPhoto* _tmp28_ = NULL; - LibraryPhoto* _tmp29_ = NULL; + MediaSource* _tmp27_; + LibraryPhoto* _tmp28_; + LibraryPhoto* _tmp29_; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp23_ = _media_it; #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2054,7 +2059,7 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) if (!_tmp24_) { #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2058 "MetadataWriter.c" +#line 2063 "MetadataWriter.c" } #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp25_ = _media_it; @@ -2072,61 +2077,61 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map) _tmp29_ = photo; #line 412 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp29_ != NULL) { -#line 2076 "MetadataWriter.c" - GeeHashSet* _tmp30_ = NULL; - LibraryPhoto* _tmp31_ = NULL; +#line 2081 "MetadataWriter.c" + GeeHashSet* _tmp30_; + LibraryPhoto* _tmp31_; #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp30_ = photos; #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp31_ = photo; #line 413 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); -#line 2085 "MetadataWriter.c" +#line 2090 "MetadataWriter.c" } #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (media); -#line 2091 "MetadataWriter.c" +#line 2096 "MetadataWriter.c" } #line 410 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_media_it); -#line 2095 "MetadataWriter.c" +#line 2100 "MetadataWriter.c" } #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (object); -#line 2099 "MetadataWriter.c" +#line 2104 "MetadataWriter.c" } #line 403 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_object_it); -#line 2103 "MetadataWriter.c" +#line 2108 "MetadataWriter.c" } #line 417 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp32_ = photos; #line 417 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp32_ != NULL) { -#line 2109 "MetadataWriter.c" - GeeHashSet* _tmp33_ = NULL; +#line 2114 "MetadataWriter.c" + GeeHashSet* _tmp33_; #line 418 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp33_ = photos; #line 418 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), "tag renamed", FALSE); -#line 2115 "MetadataWriter.c" +#line 2120 "MetadataWriter.c" } #line 401 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 2119 "MetadataWriter.c" +#line 2124 "MetadataWriter.c" } static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) { Tag* tag = NULL; - ContainerSource* _tmp0_ = NULL; - Tag* _tmp1_ = NULL; + ContainerSource* _tmp0_; + Tag* _tmp1_; gboolean _tmp2_ = FALSE; - GeeCollection* _tmp3_ = NULL; + GeeCollection* _tmp3_; gboolean _tmp27_ = FALSE; - GeeCollection* _tmp28_ = NULL; + GeeCollection* _tmp28_; #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2145,38 +2150,38 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _tmp3_ = added; #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp3_ != NULL) { -#line 2149 "MetadataWriter.c" - gboolean _tmp4_ = FALSE; +#line 2154 "MetadataWriter.c" + gboolean _tmp4_; #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = relinking; #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = !_tmp4_; -#line 2155 "MetadataWriter.c" +#line 2160 "MetadataWriter.c" } else { #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = FALSE; -#line 2159 "MetadataWriter.c" +#line 2164 "MetadataWriter.c" } #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp2_) { -#line 2163 "MetadataWriter.c" +#line 2168 "MetadataWriter.c" GeeArrayList* added_photos = NULL; - GeeArrayList* _tmp5_ = NULL; - GeeArrayList* _tmp21_ = NULL; - Tag* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + GeeArrayList* _tmp5_; + GeeArrayList* _tmp21_; + Tag* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala" added_photos = _tmp5_; -#line 2176 "MetadataWriter.c" +#line 2181 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = added; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2185,17 +2190,17 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _source_it = _tmp7_; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2189 "MetadataWriter.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 2194 "MetadataWriter.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; DataSource* source = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; LibraryPhoto* photo = NULL; - DataSource* _tmp12_ = NULL; - LibraryPhoto* _tmp13_ = NULL; + DataSource* _tmp12_; + LibraryPhoto* _tmp13_; gboolean _tmp14_ = FALSE; - LibraryPhoto* _tmp15_ = NULL; + LibraryPhoto* _tmp15_; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp8_ = _source_it; #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2204,7 +2209,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta if (!_tmp9_) { #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2208 "MetadataWriter.c" +#line 2213 "MetadataWriter.c" } #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp10_ = _source_it; @@ -2222,10 +2227,10 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _tmp15_ = photo; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp15_ != NULL) { -#line 2226 "MetadataWriter.c" - GeeHashSet* _tmp16_ = NULL; - LibraryPhoto* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; +#line 2231 "MetadataWriter.c" + GeeHashSet* _tmp16_; + LibraryPhoto* _tmp17_; + gboolean _tmp18_; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = self->priv->importing_photos; #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2234,34 +2239,34 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _tmp18_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = !_tmp18_; -#line 2238 "MetadataWriter.c" +#line 2243 "MetadataWriter.c" } else { #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = FALSE; -#line 2242 "MetadataWriter.c" +#line 2247 "MetadataWriter.c" } #line 429 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp14_) { -#line 2246 "MetadataWriter.c" - GeeArrayList* _tmp19_ = NULL; - LibraryPhoto* _tmp20_ = NULL; +#line 2251 "MetadataWriter.c" + GeeArrayList* _tmp19_; + LibraryPhoto* _tmp20_; #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp19_ = added_photos; #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp20_ = photo; #line 430 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); -#line 2255 "MetadataWriter.c" +#line 2260 "MetadataWriter.c" } #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 2261 "MetadataWriter.c" +#line 2266 "MetadataWriter.c" } #line 427 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 2265 "MetadataWriter.c" +#line 2270 "MetadataWriter.c" } #line 433 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp21_ = added_photos; @@ -2283,44 +2288,44 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _g_free0 (_tmp24_); #line 425 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (added_photos); -#line 2287 "MetadataWriter.c" +#line 2292 "MetadataWriter.c" } #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp28_ = removed; #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp28_ != NULL) { -#line 2293 "MetadataWriter.c" - gboolean _tmp29_ = FALSE; +#line 2298 "MetadataWriter.c" + gboolean _tmp29_; #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp29_ = unlinking; #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp27_ = !_tmp29_; -#line 2299 "MetadataWriter.c" +#line 2304 "MetadataWriter.c" } else { #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp27_ = FALSE; -#line 2303 "MetadataWriter.c" +#line 2308 "MetadataWriter.c" } #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp27_) { -#line 2307 "MetadataWriter.c" +#line 2312 "MetadataWriter.c" GeeArrayList* removed_photos = NULL; - GeeArrayList* _tmp30_ = NULL; - GeeArrayList* _tmp42_ = NULL; - Tag* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; + GeeArrayList* _tmp30_; + GeeArrayList* _tmp42_; + Tag* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp30_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala" removed_photos = _tmp30_; -#line 2320 "MetadataWriter.c" +#line 2325 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp31_ = NULL; - GeeIterator* _tmp32_ = NULL; + GeeCollection* _tmp31_; + GeeIterator* _tmp32_; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp31_ = removed; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2329,16 +2334,16 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _source_it = _tmp32_; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2333 "MetadataWriter.c" - GeeIterator* _tmp33_ = NULL; - gboolean _tmp34_ = FALSE; +#line 2338 "MetadataWriter.c" + GeeIterator* _tmp33_; + gboolean _tmp34_; DataSource* source = NULL; - GeeIterator* _tmp35_ = NULL; - gpointer _tmp36_ = NULL; + GeeIterator* _tmp35_; + gpointer _tmp36_; LibraryPhoto* photo = NULL; - DataSource* _tmp37_ = NULL; - LibraryPhoto* _tmp38_ = NULL; - LibraryPhoto* _tmp39_ = NULL; + DataSource* _tmp37_; + LibraryPhoto* _tmp38_; + LibraryPhoto* _tmp39_; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp33_ = _source_it; #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2347,7 +2352,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta if (!_tmp34_) { #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2351 "MetadataWriter.c" +#line 2356 "MetadataWriter.c" } #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp35_ = _source_it; @@ -2365,26 +2370,26 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _tmp39_ = photo; #line 440 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp39_ != NULL) { -#line 2369 "MetadataWriter.c" - GeeArrayList* _tmp40_ = NULL; - LibraryPhoto* _tmp41_ = NULL; +#line 2374 "MetadataWriter.c" + GeeArrayList* _tmp40_; + LibraryPhoto* _tmp41_; #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp40_ = removed_photos; #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp41_ = photo; #line 441 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_); -#line 2378 "MetadataWriter.c" +#line 2383 "MetadataWriter.c" } #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 2384 "MetadataWriter.c" +#line 2389 "MetadataWriter.c" } #line 438 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 2388 "MetadataWriter.c" +#line 2393 "MetadataWriter.c" } #line 444 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp42_ = removed_photos; @@ -2406,23 +2411,23 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta _g_free0 (_tmp45_); #line 436 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (removed_photos); -#line 2410 "MetadataWriter.c" +#line 2415 "MetadataWriter.c" } #line 421 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (tag); -#line 2414 "MetadataWriter.c" +#line 2419 "MetadataWriter.c" } static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, ContainerSource* container, GeeCollection* sources) { GeeArrayList* photos = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeArrayList* _tmp12_ = NULL; - ContainerSource* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayList* _tmp12_; + ContainerSource* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2433,11 +2438,11 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 449 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = _tmp0_; -#line 2437 "MetadataWriter.c" +#line 2442 "MetadataWriter.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = sources; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2446,16 +2451,16 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta _source_it = _tmp2_; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2450 "MetadataWriter.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 2455 "MetadataWriter.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; + DataSource* _tmp7_; + LibraryPhoto* _tmp8_; + LibraryPhoto* _tmp9_; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = _source_it; #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2464,7 +2469,7 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta if (!_tmp4_) { #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2468 "MetadataWriter.c" +#line 2473 "MetadataWriter.c" } #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = _source_it; @@ -2482,26 +2487,26 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta _tmp9_ = photo; #line 452 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp9_ != NULL) { -#line 2486 "MetadataWriter.c" - GeeArrayList* _tmp10_ = NULL; - LibraryPhoto* _tmp11_ = NULL; +#line 2491 "MetadataWriter.c" + GeeArrayList* _tmp10_; + LibraryPhoto* _tmp11_; #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp10_ = photos; #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp11_ = photo; #line 453 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 2495 "MetadataWriter.c" +#line 2500 "MetadataWriter.c" } #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (source); -#line 2501 "MetadataWriter.c" +#line 2506 "MetadataWriter.c" } #line 450 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_source_it); -#line 2505 "MetadataWriter.c" +#line 2510 "MetadataWriter.c" } #line 456 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp12_ = photos; @@ -2523,14 +2528,14 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta _g_free0 (_tmp15_); #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 2527 "MetadataWriter.c" +#line 2532 "MetadataWriter.c" } static void metadata_writer_count_enqueued_work (MetadataWriter* self, gint count, gboolean report) { - guint _tmp0_ = 0U; - gint _tmp1_ = 0; - gboolean _tmp2_ = FALSE; + guint _tmp0_; + gint _tmp1_; + gboolean _tmp2_; #line 459 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 460 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2543,27 +2548,27 @@ static void metadata_writer_count_enqueued_work (MetadataWriter* self, gint coun _tmp2_ = report; #line 466 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp2_) { -#line 2547 "MetadataWriter.c" - guint _tmp3_ = 0U; - guint _tmp4_ = 0U; +#line 2552 "MetadataWriter.c" + guint _tmp3_; + guint _tmp4_; #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = self->priv->outstanding_completed; #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = self->priv->outstanding_total; #line 467 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit_by_name (self, "progress", _tmp3_, _tmp4_); -#line 2556 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp3_, _tmp4_); +#line 2561 "MetadataWriter.c" } } static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint count, gboolean report) { guint _tmp0_ = 0U; - guint _tmp1_ = 0U; - gint _tmp2_ = 0; - guint _tmp5_ = 0U; - guint _tmp6_ = 0U; - gboolean _tmp7_ = FALSE; + guint _tmp1_; + gint _tmp2_; + guint _tmp5_; + guint _tmp6_; + gboolean _tmp7_; #line 470 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2572,20 +2577,20 @@ static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint cou _tmp2_ = count; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp1_ >= ((guint) _tmp2_)) { -#line 2576 "MetadataWriter.c" - guint _tmp3_ = 0U; - gint _tmp4_ = 0; +#line 2581 "MetadataWriter.c" + guint _tmp3_; + gint _tmp4_; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = self->priv->outstanding_total; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = count; #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = _tmp3_ - _tmp4_; -#line 2585 "MetadataWriter.c" +#line 2590 "MetadataWriter.c" } else { #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = (guint) 0; -#line 2589 "MetadataWriter.c" +#line 2594 "MetadataWriter.c" } #line 471 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_total = _tmp0_; @@ -2599,32 +2604,32 @@ static void metadata_writer_count_cancelled_work (MetadataWriter* self, gint cou self->priv->outstanding_completed = (guint) 0; #line 474 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_total = (guint) 0; -#line 2603 "MetadataWriter.c" +#line 2608 "MetadataWriter.c" } #line 481 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = report; #line 481 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp7_) { -#line 2609 "MetadataWriter.c" - guint _tmp8_ = 0U; - guint _tmp9_ = 0U; +#line 2614 "MetadataWriter.c" + guint _tmp8_; + guint _tmp9_; #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp8_ = self->priv->outstanding_completed; #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp9_ = self->priv->outstanding_total; #line 482 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit_by_name (self, "progress", _tmp8_, _tmp9_); -#line 2618 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp8_, _tmp9_); +#line 2623 "MetadataWriter.c" } } static void metadata_writer_count_completed_work (MetadataWriter* self, gint count, gboolean report) { - guint _tmp0_ = 0U; - gint _tmp1_ = 0; - guint _tmp2_ = 0U; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; + guint _tmp0_; + gint _tmp1_; + guint _tmp2_; + guint _tmp3_; + gboolean _tmp4_; #line 485 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 486 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2643,29 +2648,29 @@ static void metadata_writer_count_completed_work (MetadataWriter* self, gint cou self->priv->outstanding_completed = (guint) 0; #line 489 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->outstanding_total = (guint) 0; -#line 2647 "MetadataWriter.c" +#line 2652 "MetadataWriter.c" } #line 496 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = report; #line 496 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp4_) { -#line 2653 "MetadataWriter.c" - guint _tmp5_ = 0U; - guint _tmp6_ = 0U; +#line 2658 "MetadataWriter.c" + guint _tmp5_; + guint _tmp6_; #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = self->priv->outstanding_completed; #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = self->priv->outstanding_total; #line 497 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_emit_by_name (self, "progress", _tmp5_, _tmp6_); -#line 2662 "MetadataWriter.c" + g_signal_emit (self, metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL], 0, _tmp5_, _tmp6_); +#line 2667 "MetadataWriter.c" } } static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable* media_sources, const gchar* reason) { GeeArrayList* photos = NULL; - GeeArrayList* _tmp18_ = NULL; + GeeArrayList* _tmp18_; #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2674,11 +2679,11 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable g_return_if_fail (reason != NULL); #line 501 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = NULL; -#line 2678 "MetadataWriter.c" +#line 2683 "MetadataWriter.c" { GeeIterator* _media_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = media_sources; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2687,21 +2692,21 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable _media_it = _tmp1_; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2691 "MetadataWriter.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2696 "MetadataWriter.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; MediaSource* media = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; LibraryPhoto* photo = NULL; - MediaSource* _tmp6_ = NULL; - LibraryPhoto* _tmp7_ = NULL; - LibraryPhoto* _tmp8_ = NULL; - GeeHashSet* _tmp9_ = NULL; - LibraryPhoto* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - LibraryPhoto* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + MediaSource* _tmp6_; + LibraryPhoto* _tmp7_; + LibraryPhoto* _tmp8_; + GeeHashSet* _tmp9_; + LibraryPhoto* _tmp10_; + gboolean _tmp11_; + LibraryPhoto* _tmp12_; + gboolean _tmp13_; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp2_ = _media_it; #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2710,7 +2715,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable if (!_tmp3_) { #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2714 "MetadataWriter.c" +#line 2719 "MetadataWriter.c" } #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = _media_it; @@ -2734,7 +2739,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable _g_object_unref0 (media); #line 505 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 2738 "MetadataWriter.c" +#line 2743 "MetadataWriter.c" } #line 508 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp9_ = self->priv->importing_photos; @@ -2750,7 +2755,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable _g_object_unref0 (media); #line 509 "/home/jens/Source/shotwell/src/MetadataWriter.vala" continue; -#line 2754 "MetadataWriter.c" +#line 2759 "MetadataWriter.c" } #line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp12_ = photo; @@ -2758,23 +2763,23 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable _tmp13_ = photo_is_master_metadata_dirty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo)); #line 511 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp13_) { -#line 2762 "MetadataWriter.c" - GeeArrayList* _tmp14_ = NULL; - GeeArrayList* _tmp16_ = NULL; - LibraryPhoto* _tmp17_ = NULL; +#line 2767 "MetadataWriter.c" + GeeArrayList* _tmp14_; + GeeArrayList* _tmp16_; + LibraryPhoto* _tmp17_; #line 512 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = photos; #line 512 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp14_ == NULL) { -#line 2770 "MetadataWriter.c" - GeeArrayList* _tmp15_ = NULL; +#line 2775 "MetadataWriter.c" + GeeArrayList* _tmp15_; #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp15_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photos = _tmp15_; -#line 2778 "MetadataWriter.c" +#line 2783 "MetadataWriter.c" } #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = photos; @@ -2782,49 +2787,49 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable _tmp17_ = photo; #line 515 "/home/jens/Source/shotwell/src/MetadataWriter.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 2786 "MetadataWriter.c" +#line 2791 "MetadataWriter.c" } #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (media); -#line 2792 "MetadataWriter.c" +#line 2797 "MetadataWriter.c" } #line 502 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_media_it); -#line 2796 "MetadataWriter.c" +#line 2801 "MetadataWriter.c" } #line 519 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp18_ = photos; #line 519 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp18_ != NULL) { -#line 2802 "MetadataWriter.c" - GeeArrayList* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; +#line 2807 "MetadataWriter.c" + GeeArrayList* _tmp19_; + const gchar* _tmp20_; #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp19_ = photos; #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp20_ = reason; #line 520 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_photos_are_dirty (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_, TRUE); -#line 2811 "MetadataWriter.c" +#line 2816 "MetadataWriter.c" } #line 500 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photos); -#line 2815 "MetadataWriter.c" +#line 2820 "MetadataWriter.c" } static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollection* photos, const gchar* reason, gboolean already_marked) { - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gboolean _tmp10_ = FALSE; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; + gboolean _tmp10_; gboolean _tmp28_ = FALSE; - gboolean _tmp29_ = FALSE; - GeeCollection* _tmp41_ = NULL; - gint _tmp42_ = 0; - gint _tmp43_ = 0; + gboolean _tmp29_; + GeeCollection* _tmp41_; + gint _tmp42_; + gint _tmp43_; GError * _inner_error_ = NULL; #line 524 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); @@ -2842,12 +2847,12 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio if (_tmp2_ == 0) { #line 526 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 2846 "MetadataWriter.c" +#line 2851 "MetadataWriter.c" } { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = photos; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2856,13 +2861,13 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _photo_it = _tmp4_; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2860 "MetadataWriter.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 2865 "MetadataWriter.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - LibraryPhoto* _tmp9_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; + LibraryPhoto* _tmp9_; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = _photo_it; #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2871,7 +2876,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio if (!_tmp6_) { #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2875 "MetadataWriter.c" +#line 2880 "MetadataWriter.c" } #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = _photo_it; @@ -2885,24 +2890,24 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio metadata_writer_cancel_job (self, _tmp9_); #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); -#line 2889 "MetadataWriter.c" +#line 2894 "MetadataWriter.c" } #line 529 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 2893 "MetadataWriter.c" +#line 2898 "MetadataWriter.c" } #line 533 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp10_ = already_marked; #line 533 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (!_tmp10_) { -#line 2899 "MetadataWriter.c" +#line 2904 "MetadataWriter.c" { - LibraryPhotoSourceCollection* _tmp11_ = NULL; - TransactionController* _tmp12_ = NULL; - TransactionController* _tmp13_ = NULL; - LibraryPhotoSourceCollection* _tmp21_ = NULL; - TransactionController* _tmp22_ = NULL; - TransactionController* _tmp23_ = NULL; + LibraryPhotoSourceCollection* _tmp11_; + TransactionController* _tmp12_; + TransactionController* _tmp13_; + LibraryPhotoSourceCollection* _tmp21_; + TransactionController* _tmp22_; + TransactionController* _tmp23_; #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp11_ = library_photo_global; #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2911,11 +2916,11 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _tmp13_ = _tmp12_; #line 535 "/home/jens/Source/shotwell/src/MetadataWriter.vala" transaction_controller_begin (_tmp13_); -#line 2915 "MetadataWriter.c" +#line 2920 "MetadataWriter.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp14_ = NULL; - GeeIterator* _tmp15_ = NULL; + GeeCollection* _tmp14_; + GeeIterator* _tmp15_; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = photos; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2924,13 +2929,13 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _photo_it = _tmp15_; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 2928 "MetadataWriter.c" - GeeIterator* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; +#line 2933 "MetadataWriter.c" + GeeIterator* _tmp16_; + gboolean _tmp17_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - LibraryPhoto* _tmp20_ = NULL; + GeeIterator* _tmp18_; + gpointer _tmp19_; + LibraryPhoto* _tmp20_; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = _photo_it; #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2939,7 +2944,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio if (!_tmp17_) { #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 2943 "MetadataWriter.c" +#line 2948 "MetadataWriter.c" } #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp18_ = _photo_it; @@ -2957,16 +2962,16 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _g_object_unref0 (photo); #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 2961 "MetadataWriter.c" - goto __catch553_g_error; +#line 2966 "MetadataWriter.c" + goto __catch554_g_error; } #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); -#line 2966 "MetadataWriter.c" +#line 2971 "MetadataWriter.c" } #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 2970 "MetadataWriter.c" +#line 2975 "MetadataWriter.c" } #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp21_ = library_photo_global; @@ -2976,13 +2981,13 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _tmp23_ = _tmp22_; #line 540 "/home/jens/Source/shotwell/src/MetadataWriter.vala" transaction_controller_commit (_tmp23_); -#line 2980 "MetadataWriter.c" +#line 2985 "MetadataWriter.c" } - goto __finally553; - __catch553_g_error: + goto __finally554; + __catch554_g_error: { GError* err = NULL; - GError* _tmp24_ = NULL; + GError* _tmp24_; #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -2991,29 +2996,29 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _tmp24_ = err; #line 542 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp24_->domain == DATABASE_ERROR) { -#line 2995 "MetadataWriter.c" - GError* _tmp25_ = NULL; +#line 3000 "MetadataWriter.c" + GError* _tmp25_; #line 543 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp25_ = err; #line 543 "/home/jens/Source/shotwell/src/MetadataWriter.vala" app_window_database_error ((GError*) _tmp25_); -#line 3001 "MetadataWriter.c" +#line 3006 "MetadataWriter.c" } else { - GError* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; + GError* _tmp26_; + const gchar* _tmp27_; #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp26_ = err; #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp27_ = _tmp26_->message; #line 545 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_error ("MetadataWriter.vala:545: Unable to mark metadata as dirty: %s", _tmp27_); -#line 3011 "MetadataWriter.c" +#line 3016 "MetadataWriter.c" } #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 3015 "MetadataWriter.c" +#line 3020 "MetadataWriter.c" } - __finally553: + __finally554: #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3022,7 +3027,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio g_clear_error (&_inner_error_); #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3026 "MetadataWriter.c" +#line 3031 "MetadataWriter.c" } } #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3031,25 +3036,25 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio if (_tmp29_) { #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp28_ = TRUE; -#line 3035 "MetadataWriter.c" +#line 3040 "MetadataWriter.c" } else { - gboolean _tmp30_ = FALSE; + gboolean _tmp30_; #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp30_ = self->priv->enabled; #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp28_ = !_tmp30_; -#line 3042 "MetadataWriter.c" +#line 3047 "MetadataWriter.c" } #line 551 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp28_) { #line 552 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3048 "MetadataWriter.c" +#line 3053 "MetadataWriter.c" } { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp31_ = NULL; - GeeIterator* _tmp32_ = NULL; + GeeCollection* _tmp31_; + GeeIterator* _tmp32_; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp31_ = photos; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3058,17 +3063,17 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _photo_it = _tmp32_; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 3062 "MetadataWriter.c" - GeeIterator* _tmp33_ = NULL; - gboolean _tmp34_ = FALSE; +#line 3067 "MetadataWriter.c" + GeeIterator* _tmp33_; + gboolean _tmp34_; LibraryPhoto* photo = NULL; - GeeIterator* _tmp35_ = NULL; - gpointer _tmp36_ = NULL; + GeeIterator* _tmp35_; + gpointer _tmp36_; gboolean enqueued = FALSE; - HashTimedQueue* _tmp37_ = NULL; - LibraryPhoto* _tmp38_ = NULL; - gboolean _tmp39_ = FALSE; - gboolean _tmp40_ = FALSE; + HashTimedQueue* _tmp37_; + LibraryPhoto* _tmp38_; + gboolean _tmp39_; + gboolean _tmp40_; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp33_ = _photo_it; #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3077,7 +3082,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio if (!_tmp34_) { #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 3081 "MetadataWriter.c" +#line 3086 "MetadataWriter.c" } #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp35_ = _photo_it; @@ -3099,11 +3104,11 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _vala_assert (_tmp40_, "enqueued"); #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (photo); -#line 3103 "MetadataWriter.c" +#line 3108 "MetadataWriter.c" } #line 558 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_photo_it); -#line 3107 "MetadataWriter.c" +#line 3112 "MetadataWriter.c" } #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp41_ = photos; @@ -3113,28 +3118,28 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio _tmp43_ = _tmp42_; #line 563 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_enqueued_work (self, _tmp43_, TRUE); -#line 3117 "MetadataWriter.c" +#line 3122 "MetadataWriter.c" } static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) { - HashTimedQueue* _tmp0_ = NULL; - gboolean _tmp12_ = FALSE; + HashTimedQueue* _tmp0_; + gboolean _tmp12_; #line 566 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 567 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = self->priv->dirty; #line 567 "/home/jens/Source/shotwell/src/MetadataWriter.vala" timed_queue_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TIMED_QUEUE, TimedQueue)); -#line 3130 "MetadataWriter.c" +#line 3135 "MetadataWriter.c" { GeeIterator* _job_it = NULL; - GeeHashMap* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + GeeHashMap* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeIterator* _tmp5_; + GeeIterator* _tmp6_; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp1_ = self->priv->pending; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3153,13 +3158,13 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) { _job_it = _tmp6_; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 3157 "MetadataWriter.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 3162 "MetadataWriter.c" + GeeIterator* _tmp7_; + gboolean _tmp8_; MetadataWriterCommitJob* job = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; - MetadataWriterCommitJob* _tmp11_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; + MetadataWriterCommitJob* _tmp11_; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = _job_it; #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3168,7 +3173,7 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) { if (!_tmp8_) { #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 3172 "MetadataWriter.c" +#line 3177 "MetadataWriter.c" } #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp9_ = _job_it; @@ -3182,39 +3187,39 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) { background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); -#line 3186 "MetadataWriter.c" +#line 3191 "MetadataWriter.c" } #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_job_it); -#line 3190 "MetadataWriter.c" +#line 3195 "MetadataWriter.c" } #line 572 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp12_ = wait; #line 572 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp12_) { -#line 3196 "MetadataWriter.c" - Workers* _tmp13_ = NULL; +#line 3201 "MetadataWriter.c" + Workers* _tmp13_; #line 573 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp13_ = self->priv->workers; #line 573 "/home/jens/Source/shotwell/src/MetadataWriter.vala" workers_wait_for_empty_queue (_tmp13_); -#line 3202 "MetadataWriter.c" +#line 3207 "MetadataWriter.c" } #line 575 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_cancelled_work (self, G_MAXINT, TRUE); -#line 3206 "MetadataWriter.c" +#line 3211 "MetadataWriter.c" } static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* photo) { gboolean result = FALSE; gboolean cancelled = FALSE; - GeeHashMap* _tmp0_ = NULL; - LibraryPhoto* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - HashTimedQueue* _tmp11_ = NULL; - LibraryPhoto* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GeeHashMap* _tmp0_; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; + HashTimedQueue* _tmp11_; + LibraryPhoto* _tmp12_; + gboolean _tmp13_; #line 578 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail (IS_METADATA_WRITER (self), FALSE); #line 578 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3229,16 +3234,16 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp2_) { -#line 3233 "MetadataWriter.c" +#line 3238 "MetadataWriter.c" MetadataWriterCommitJob* j = NULL; - GeeHashMap* _tmp3_ = NULL; - LibraryPhoto* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - MetadataWriterCommitJob* _tmp7_ = NULL; - MetadataWriterCommitJob* _tmp8_ = NULL; - GeeHashMap* _tmp9_ = NULL; - LibraryPhoto* _tmp10_ = NULL; + GeeHashMap* _tmp3_; + LibraryPhoto* _tmp4_; + gpointer _tmp5_; + GeeHashSet* _tmp6_; + MetadataWriterCommitJob* _tmp7_; + MetadataWriterCommitJob* _tmp8_; + GeeHashMap* _tmp9_; + LibraryPhoto* _tmp10_; #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = self->priv->pending; #line 582 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3267,7 +3272,7 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* cancelled = TRUE; #line 581 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (j); -#line 3271 "MetadataWriter.c" +#line 3276 "MetadataWriter.c" } #line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp11_ = self->priv->dirty; @@ -3277,15 +3282,15 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* _tmp13_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TIMED_QUEUE, TimedQueue), _tmp12_); #line 589 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp13_) { -#line 3281 "MetadataWriter.c" +#line 3286 "MetadataWriter.c" gboolean removed = FALSE; - HashTimedQueue* _tmp14_ = NULL; - LibraryPhoto* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; - HashTimedQueue* _tmp18_ = NULL; - LibraryPhoto* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + HashTimedQueue* _tmp14_; + LibraryPhoto* _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + HashTimedQueue* _tmp18_; + LibraryPhoto* _tmp19_; + gboolean _tmp20_; #line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp14_ = self->priv->dirty; #line 590 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3310,36 +3315,36 @@ static gboolean metadata_writer_cancel_job (MetadataWriter* self, LibraryPhoto* metadata_writer_count_cancelled_work (self, 1, FALSE); #line 596 "/home/jens/Source/shotwell/src/MetadataWriter.vala" cancelled = TRUE; -#line 3314 "MetadataWriter.c" +#line 3319 "MetadataWriter.c" } #line 599 "/home/jens/Source/shotwell/src/MetadataWriter.vala" result = cancelled; #line 599 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return result; -#line 3320 "MetadataWriter.c" +#line 3325 "MetadataWriter.c" } static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhoto* photo) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; GeeSet* keywords = NULL; GeeCollection* tags = NULL; - TagSourceCollection* _tmp1_ = NULL; - LibraryPhoto* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeHashMap* _tmp16_ = NULL; - LibraryPhoto* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + TagSourceCollection* _tmp1_; + LibraryPhoto* _tmp2_; + GeeList* _tmp3_; + GeeCollection* _tmp4_; + GeeHashMap* _tmp16_; + LibraryPhoto* _tmp17_; + gboolean _tmp18_; MetadataWriterCommitJob* job = NULL; - LibraryPhoto* _tmp20_ = NULL; - GeeSet* _tmp21_ = NULL; - MetadataWriterCommitJob* _tmp22_ = NULL; - GeeHashMap* _tmp23_ = NULL; - LibraryPhoto* _tmp24_ = NULL; - MetadataWriterCommitJob* _tmp25_ = NULL; - Workers* _tmp26_ = NULL; - MetadataWriterCommitJob* _tmp27_ = NULL; + LibraryPhoto* _tmp20_; + GeeSet* _tmp21_; + MetadataWriterCommitJob* _tmp22_; + GeeHashMap* _tmp23_; + LibraryPhoto* _tmp24_; + MetadataWriterCommitJob* _tmp25_; + Workers* _tmp26_; + MetadataWriterCommitJob* _tmp27_; #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3352,7 +3357,7 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot metadata_writer_count_cancelled_work (self, 1, TRUE); #line 606 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3356 "MetadataWriter.c" +#line 3361 "MetadataWriter.c" } #line 609 "/home/jens/Source/shotwell/src/MetadataWriter.vala" keywords = NULL; @@ -3368,19 +3373,19 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot _tmp4_ = tags; #line 611 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp4_ != NULL) { -#line 3372 "MetadataWriter.c" - GeeHashSet* _tmp5_ = NULL; +#line 3377 "MetadataWriter.c" + GeeHashSet* _tmp5_; #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (keywords); #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala" keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet); -#line 3380 "MetadataWriter.c" +#line 3385 "MetadataWriter.c" { GeeIterator* _tag_it = NULL; - GeeCollection* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp6_ = tags; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3389,16 +3394,16 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot _tag_it = _tmp7_; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 3393 "MetadataWriter.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 3398 "MetadataWriter.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; Tag* tag = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - GeeSet* _tmp12_ = NULL; - Tag* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; + GeeSet* _tmp12_; + Tag* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp8_ = _tag_it; #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3407,7 +3412,7 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot if (!_tmp9_) { #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 3411 "MetadataWriter.c" +#line 3416 "MetadataWriter.c" } #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp10_ = _tag_it; @@ -3429,11 +3434,11 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot _g_free0 (_tmp15_); #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (tag); -#line 3433 "MetadataWriter.c" +#line 3438 "MetadataWriter.c" } #line 613 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tag_it); -#line 3437 "MetadataWriter.c" +#line 3442 "MetadataWriter.c" } } #line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3444,13 +3449,13 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot _tmp18_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_); #line 618 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp18_) { -#line 3448 "MetadataWriter.c" - LibraryPhoto* _tmp19_ = NULL; +#line 3453 "MetadataWriter.c" + LibraryPhoto* _tmp19_; #line 619 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp19_ = photo; #line 619 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_cancel_job (self, _tmp19_); -#line 3454 "MetadataWriter.c" +#line 3459 "MetadataWriter.c" } #line 621 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp20_ = photo; @@ -3480,38 +3485,38 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot _g_object_unref0 (tags); #line 602 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (keywords); -#line 3484 "MetadataWriter.c" +#line 3489 "MetadataWriter.c" } static gpointer _background_job_ref0 (gpointer self) { #line 632 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self ? background_job_ref (self) : NULL; -#line 3491 "MetadataWriter.c" +#line 3496 "MetadataWriter.c" } static void metadata_writer_on_update_completed (MetadataWriter* self, BackgroundJob* j) { MetadataWriterCommitJob* job = NULL; - BackgroundJob* _tmp0_ = NULL; - MetadataWriterCommitJob* _tmp1_ = NULL; - MetadataWriterCommitJob* _tmp2_ = NULL; - GError* _tmp3_ = NULL; + BackgroundJob* _tmp0_; + MetadataWriterCommitJob* _tmp1_; + MetadataWriterCommitJob* _tmp2_; + GError* _tmp3_; gboolean removed = FALSE; - GeeHashMap* _tmp44_ = NULL; - MetadataWriterCommitJob* _tmp45_ = NULL; - LibraryPhoto* _tmp46_ = NULL; - gboolean _tmp47_ = FALSE; - gboolean _tmp48_ = FALSE; - LibraryPhotoSourceCollection* _tmp49_ = NULL; - TransactionController* _tmp50_ = NULL; - TransactionController* _tmp51_ = NULL; + GeeHashMap* _tmp44_; + MetadataWriterCommitJob* _tmp45_; + LibraryPhoto* _tmp46_; + gboolean _tmp47_; + gboolean _tmp48_; + LibraryPhotoSourceCollection* _tmp49_; + TransactionController* _tmp50_; + TransactionController* _tmp51_; gboolean _tmp52_ = FALSE; - MetadataWriterCommitJob* _tmp53_ = NULL; - PhotoReimportMasterState* _tmp54_ = NULL; - LibraryPhotoSourceCollection* _tmp86_ = NULL; - TransactionController* _tmp87_ = NULL; - TransactionController* _tmp88_ = NULL; + MetadataWriterCommitJob* _tmp53_; + PhotoReimportMasterState* _tmp54_; + LibraryPhotoSourceCollection* _tmp86_; + TransactionController* _tmp87_; + TransactionController* _tmp88_; GError * _inner_error_ = NULL; #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); @@ -3529,14 +3534,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _tmp3_ = _tmp2_->err; #line 634 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp3_ != NULL) { -#line 3533 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp4_ = NULL; - LibraryPhoto* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - MetadataWriterCommitJob* _tmp8_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; +#line 3538 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp4_; + LibraryPhoto* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + MetadataWriterCommitJob* _tmp8_; + GError* _tmp9_; + const gchar* _tmp10_; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp4_ = job; #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3555,28 +3560,28 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_warning ("MetadataWriter.vala:635: Unable to write metadata to %s: %s", _tmp7_, _tmp10_); #line 635 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (_tmp7_); -#line 3559 "MetadataWriter.c" +#line 3564 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - MetadataWriterCommitJob* _tmp25_ = NULL; - LibraryPhoto* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + MetadataWriterCommitJob* _tmp11_; + gboolean _tmp12_; + MetadataWriterCommitJob* _tmp25_; + LibraryPhoto* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; + gboolean _tmp29_; #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp11_ = job; #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp12_ = _tmp11_->wrote_master; #line 637 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp12_) { -#line 3574 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp13_ = NULL; - LibraryPhoto* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; +#line 3579 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp13_; + LibraryPhoto* _tmp14_; + GFile* _tmp15_; + GFile* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp13_ = job; #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3595,14 +3600,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_free0 (_tmp18_); #line 638 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp16_); -#line 3599 "MetadataWriter.c" +#line 3604 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp19_ = NULL; - LibraryPhoto* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + MetadataWriterCommitJob* _tmp19_; + LibraryPhoto* _tmp20_; + GFile* _tmp21_; + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp19_ = job; #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3621,7 +3626,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_free0 (_tmp24_); #line 640 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp22_); -#line 3625 "MetadataWriter.c" +#line 3630 "MetadataWriter.c" } #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp25_ = job; @@ -3637,22 +3642,22 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_object_unref0 (_tmp28_); #line 642 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp29_) { -#line 3641 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; +#line 3646 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp30_; + gboolean _tmp31_; #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp30_ = job; #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp31_ = _tmp30_->wrote_editable; #line 643 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp31_) { -#line 3650 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp32_ = NULL; - LibraryPhoto* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; - GFile* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; +#line 3655 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp32_; + LibraryPhoto* _tmp33_; + GFile* _tmp34_; + GFile* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp32_ = job; #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3671,14 +3676,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_free0 (_tmp37_); #line 644 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp35_); -#line 3675 "MetadataWriter.c" +#line 3680 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp38_ = NULL; - LibraryPhoto* _tmp39_ = NULL; - GFile* _tmp40_ = NULL; - GFile* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; + MetadataWriterCommitJob* _tmp38_; + LibraryPhoto* _tmp39_; + GFile* _tmp40_; + GFile* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp38_ = job; #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3697,7 +3702,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_free0 (_tmp43_); #line 646 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp41_); -#line 3701 "MetadataWriter.c" +#line 3706 "MetadataWriter.c" } } } @@ -3731,25 +3736,25 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun if (_tmp54_ != NULL) { #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp52_ = TRUE; -#line 3735 "MetadataWriter.c" +#line 3740 "MetadataWriter.c" } else { - MetadataWriterCommitJob* _tmp55_ = NULL; - PhotoReimportEditableState* _tmp56_ = NULL; + MetadataWriterCommitJob* _tmp55_; + PhotoReimportEditableState* _tmp56_; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp55_ = job; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp56_ = _tmp55_->reimport_editable_state; #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp52_ = _tmp56_ != NULL; -#line 3745 "MetadataWriter.c" +#line 3750 "MetadataWriter.c" } #line 657 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp52_) { -#line 3749 "MetadataWriter.c" - LibraryPhoto* _tmp57_ = NULL; - MetadataWriterCommitJob* _tmp58_ = NULL; - LibraryPhoto* _tmp59_ = NULL; - LibraryPhoto* _tmp60_ = NULL; +#line 3754 "MetadataWriter.c" + LibraryPhoto* _tmp57_; + MetadataWriterCommitJob* _tmp58_; + LibraryPhoto* _tmp59_; + LibraryPhoto* _tmp60_; #line 660 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp57_ = self->priv->ignore_photo_alteration; #line 660 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3764,23 +3769,23 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_object_unref0 (self->priv->ignore_photo_alteration); #line 661 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = _tmp60_; -#line 3768 "MetadataWriter.c" +#line 3773 "MetadataWriter.c" { - MetadataWriterCommitJob* _tmp61_ = NULL; - PhotoReimportMasterState* _tmp62_ = NULL; - MetadataWriterCommitJob* _tmp70_ = NULL; - PhotoReimportEditableState* _tmp71_ = NULL; + MetadataWriterCommitJob* _tmp61_; + PhotoReimportMasterState* _tmp62_; + MetadataWriterCommitJob* _tmp70_; + PhotoReimportEditableState* _tmp71_; #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp61_ = job; #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp62_ = _tmp61_->reimport_master_state; #line 663 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp62_ != NULL) { -#line 3780 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp63_ = NULL; - LibraryPhoto* _tmp64_ = NULL; - MetadataWriterCommitJob* _tmp65_ = NULL; - PhotoReimportMasterState* _tmp66_ = NULL; +#line 3785 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp63_; + LibraryPhoto* _tmp64_; + MetadataWriterCommitJob* _tmp65_; + PhotoReimportMasterState* _tmp66_; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp63_ = job; #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3795,13 +3800,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun if (G_UNLIKELY (_inner_error_ != NULL)) { #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3799 "MetadataWriter.c" - goto __catch554_database_error; +#line 3804 "MetadataWriter.c" + goto __catch555_database_error; } { - LibraryPhoto* _tmp67_ = NULL; - MetadataWriterCommitJob* _tmp68_ = NULL; - LibraryPhoto* _tmp69_ = NULL; + LibraryPhoto* _tmp67_; + MetadataWriterCommitJob* _tmp68_; + LibraryPhoto* _tmp69_; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp67_ = self->priv->ignore_photo_alteration; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3814,7 +3819,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_object_unref0 (self->priv->ignore_photo_alteration); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = NULL; -#line 3818 "MetadataWriter.c" +#line 3823 "MetadataWriter.c" } #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); @@ -3824,7 +3829,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3828 "MetadataWriter.c" +#line 3833 "MetadataWriter.c" } } #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3833,11 +3838,11 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _tmp71_ = _tmp70_->reimport_editable_state; #line 666 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp71_ != NULL) { -#line 3837 "MetadataWriter.c" - MetadataWriterCommitJob* _tmp72_ = NULL; - LibraryPhoto* _tmp73_ = NULL; - MetadataWriterCommitJob* _tmp74_ = NULL; - PhotoReimportEditableState* _tmp75_ = NULL; +#line 3842 "MetadataWriter.c" + MetadataWriterCommitJob* _tmp72_; + LibraryPhoto* _tmp73_; + MetadataWriterCommitJob* _tmp74_; + PhotoReimportEditableState* _tmp75_; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp72_ = job; #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3852,13 +3857,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun if (G_UNLIKELY (_inner_error_ != NULL)) { #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3856 "MetadataWriter.c" - goto __catch554_database_error; +#line 3861 "MetadataWriter.c" + goto __catch555_database_error; } { - LibraryPhoto* _tmp76_ = NULL; - MetadataWriterCommitJob* _tmp77_ = NULL; - LibraryPhoto* _tmp78_ = NULL; + LibraryPhoto* _tmp76_; + MetadataWriterCommitJob* _tmp77_; + LibraryPhoto* _tmp78_; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp76_ = self->priv->ignore_photo_alteration; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3871,7 +3876,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_object_unref0 (self->priv->ignore_photo_alteration); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = NULL; -#line 3875 "MetadataWriter.c" +#line 3880 "MetadataWriter.c" } #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); @@ -3881,15 +3886,15 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3885 "MetadataWriter.c" +#line 3890 "MetadataWriter.c" } } } - goto __finally554; - __catch554_database_error: + goto __finally555; + __catch555_database_error: { GError* err = NULL; - GError* _tmp79_ = NULL; + GError* _tmp79_; #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3900,13 +3905,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun app_window_database_error (_tmp79_); #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 3904 "MetadataWriter.c" +#line 3909 "MetadataWriter.c" } - __finally554: + __finally555: { - LibraryPhoto* _tmp80_ = NULL; - MetadataWriterCommitJob* _tmp81_ = NULL; - LibraryPhoto* _tmp82_ = NULL; + LibraryPhoto* _tmp80_; + MetadataWriterCommitJob* _tmp81_; + LibraryPhoto* _tmp82_; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp80_ = self->priv->ignore_photo_alteration; #line 672 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3919,7 +3924,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun _g_object_unref0 (self->priv->ignore_photo_alteration); #line 673 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->ignore_photo_alteration = NULL; -#line 3923 "MetadataWriter.c" +#line 3928 "MetadataWriter.c" } #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -3931,13 +3936,13 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 662 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3935 "MetadataWriter.c" +#line 3940 "MetadataWriter.c" } } else { } { - MetadataWriterCommitJob* _tmp83_ = NULL; - LibraryPhoto* _tmp84_ = NULL; + MetadataWriterCommitJob* _tmp83_; + LibraryPhoto* _tmp84_; #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp83_ = job; #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3948,8 +3953,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun if (G_UNLIKELY (_inner_error_ != NULL)) { #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3952 "MetadataWriter.c" - goto __catch555_database_error; +#line 3957 "MetadataWriter.c" + goto __catch556_database_error; } #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); @@ -3959,14 +3964,14 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3963 "MetadataWriter.c" +#line 3968 "MetadataWriter.c" } } - goto __finally555; - __catch555_database_error: + goto __finally556; + __catch556_database_error: { GError* err = NULL; - GError* _tmp85_ = NULL; + GError* _tmp85_; #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3977,9 +3982,9 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun app_window_database_error (_tmp85_); #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 3981 "MetadataWriter.c" +#line 3986 "MetadataWriter.c" } - __finally555: + __finally556: #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -3990,7 +3995,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun g_clear_error (&_inner_error_); #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 3994 "MetadataWriter.c" +#line 3999 "MetadataWriter.c" } #line 688 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp86_ = library_photo_global; @@ -4004,15 +4009,15 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun metadata_writer_count_completed_work (self, 1, TRUE); #line 631 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _background_job_unref0 (job); -#line 4008 "MetadataWriter.c" +#line 4013 "MetadataWriter.c" } static void metadata_writer_on_update_cancelled (MetadataWriter* self, BackgroundJob* j) { gboolean removed = FALSE; - GeeHashSet* _tmp0_ = NULL; - BackgroundJob* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashSet* _tmp0_; + BackgroundJob* _tmp1_; + gboolean _tmp2_; #line 693 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (IS_METADATA_WRITER (self)); #line 693 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4029,7 +4034,7 @@ static void metadata_writer_on_update_cancelled (MetadataWriter* self, Backgroun _vala_assert (removed, "removed"); #line 697 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_count_cancelled_work (self, 1, TRUE); -#line 4033 "MetadataWriter.c" +#line 4038 "MetadataWriter.c" } @@ -4048,47 +4053,47 @@ static void g_cclosure_user_marshal_VOID__UINT_UINT (GClosure * closure, GValue data1 = closure->data; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" data2 = param_values->data[0].v_pointer; -#line 4052 "MetadataWriter.c" +#line 4057 "MetadataWriter.c" } else { #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" data1 = param_values->data[0].v_pointer; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" data2 = closure->data; -#line 4058 "MetadataWriter.c" +#line 4063 "MetadataWriter.c" } #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" callback = (GMarshalFunc_VOID__UINT_UINT) (marshal_data ? marshal_data : cc->callback); #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" callback (data1, g_value_get_uint (param_values + 1), g_value_get_uint (param_values + 2), data2); -#line 4064 "MetadataWriter.c" +#line 4069 "MetadataWriter.c" } static void _metadata_writer_on_update_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_update_completed ((MetadataWriter*) self, job); -#line 4071 "MetadataWriter.c" +#line 4076 "MetadataWriter.c" } static void _metadata_writer_on_update_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 30 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_on_update_cancelled ((MetadataWriter*) self, job); -#line 4078 "MetadataWriter.c" +#line 4083 "MetadataWriter.c" } static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType object_type, MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords) { MetadataWriterCommitJob* self = NULL; - MetadataWriter* _tmp0_ = NULL; - MetadataWriter* _tmp1_ = NULL; - GCancellable* _tmp2_ = NULL; - GCancellable* _tmp3_ = NULL; - MetadataWriter* _tmp4_ = NULL; - LibraryPhoto* _tmp5_ = NULL; - LibraryPhoto* _tmp6_ = NULL; - GeeSet* _tmp7_ = NULL; - GeeSet* _tmp8_ = NULL; + MetadataWriter* _tmp0_; + MetadataWriter* _tmp1_; + GCancellable* _tmp2_; + GCancellable* _tmp3_; + MetadataWriter* _tmp4_; + LibraryPhoto* _tmp5_; + LibraryPhoto* _tmp6_; + GeeSet* _tmp7_; + GeeSet* _tmp8_; #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail (IS_METADATA_WRITER (owner), NULL); #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4127,21 +4132,21 @@ static MetadataWriterCommitJob* metadata_writer_commit_job_construct (GType obje self->current_keywords = _tmp8_; #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self; -#line 4131 "MetadataWriter.c" +#line 4136 "MetadataWriter.c" } static MetadataWriterCommitJob* metadata_writer_commit_job_new (MetadataWriter* owner, LibraryPhoto* photo, GeeSet* keywords) { #line 29 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return metadata_writer_commit_job_construct (METADATA_WRITER_TYPE_COMMIT_JOB, owner, photo, keywords); -#line 4138 "MetadataWriter.c" +#line 4143 "MetadataWriter.c" } static gpointer _g_error_copy0 (gpointer self) { #line 41 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return self ? g_error_copy (self) : NULL; -#line 4145 "MetadataWriter.c" +#line 4150 "MetadataWriter.c" } @@ -4150,29 +4155,29 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) { GError * _inner_error_ = NULL; #line 36 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob); -#line 4154 "MetadataWriter.c" +#line 4159 "MetadataWriter.c" { #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_commit_job_commit_master (self, &_inner_error_); #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4160 "MetadataWriter.c" - goto __catch556_g_error; +#line 4165 "MetadataWriter.c" + goto __catch557_g_error; } #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_writer_commit_job_commit_editable (self, &_inner_error_); #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4167 "MetadataWriter.c" - goto __catch556_g_error; +#line 4172 "MetadataWriter.c" + goto __catch557_g_error; } } - goto __finally556; - __catch556_g_error: + goto __finally557; + __catch557_g_error: { GError* err = NULL; - GError* _tmp0_ = NULL; - GError* _tmp1_ = NULL; + GError* _tmp0_; + GError* _tmp1_; #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" err = _inner_error_; #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4187,9 +4192,9 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) { self->err = _tmp1_; #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_error_free0 (err); -#line 4191 "MetadataWriter.c" +#line 4196 "MetadataWriter.c" } - __finally556: + __finally557: #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4198,24 +4203,24 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4202 "MetadataWriter.c" +#line 4207 "MetadataWriter.c" } } static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* self, GError** error) { gboolean skip_orientation = FALSE; - LibraryPhoto* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - LibraryPhoto* _tmp2_ = NULL; - PhotoFileFormat _tmp3_ = 0; - gboolean _tmp4_ = FALSE; + LibraryPhoto* _tmp0_; + gboolean _tmp1_; + LibraryPhoto* _tmp2_; + PhotoFileFormat _tmp3_; + gboolean _tmp4_; PhotoMetadata* metadata = NULL; - LibraryPhoto* _tmp5_ = NULL; - PhotoMetadata* _tmp6_ = NULL; - PhotoMetadata* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + LibraryPhoto* _tmp5_; + PhotoMetadata* _tmp6_; + PhotoMetadata* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; GError * _inner_error_ = NULL; #line 45 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self)); @@ -4235,7 +4240,7 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s if (!_tmp4_) { #line 52 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4239 "MetadataWriter.c" +#line 4244 "MetadataWriter.c" } #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp5_ = self->photo; @@ -4249,7 +4254,7 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s g_propagate_error (error, _inner_error_); #line 54 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4253 "MetadataWriter.c" +#line 4258 "MetadataWriter.c" } #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = metadata; @@ -4259,10 +4264,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s _tmp9_ = metadata_writer_commit_job_update_metadata (self, _tmp7_, _tmp8_); #line 55 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp9_) { -#line 4263 "MetadataWriter.c" - LibraryPhoto* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; +#line 4268 "MetadataWriter.c" + LibraryPhoto* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp10_ = self->photo; #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4273,10 +4278,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s library_monitor_blacklist_file (_tmp12_, "MetadataWriter.commit_master"); #line 56 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp12_); -#line 4277 "MetadataWriter.c" +#line 4282 "MetadataWriter.c" { - LibraryPhoto* _tmp13_ = NULL; - PhotoMetadata* _tmp14_ = NULL; + LibraryPhoto* _tmp13_; + PhotoMetadata* _tmp14_; PhotoReimportMasterState* _tmp15_ = NULL; #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp13_ = self->photo; @@ -4290,15 +4295,15 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s self->reimport_master_state = _tmp15_; #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4294 "MetadataWriter.c" - goto __finally557; +#line 4299 "MetadataWriter.c" + goto __finally558; } } - __finally557: + __finally558: { - LibraryPhoto* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; + LibraryPhoto* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = self->photo; #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4309,7 +4314,7 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s library_monitor_unblacklist_file (_tmp18_); #line 60 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp18_); -#line 4313 "MetadataWriter.c" +#line 4318 "MetadataWriter.c" } #line 57 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -4319,27 +4324,27 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s _media_metadata_unref0 (metadata); #line 57 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4323 "MetadataWriter.c" +#line 4328 "MetadataWriter.c" } } #line 64 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->wrote_master = TRUE; #line 45 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _media_metadata_unref0 (metadata); -#line 4330 "MetadataWriter.c" +#line 4335 "MetadataWriter.c" } static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self, GError** error) { gboolean _tmp0_ = FALSE; - LibraryPhoto* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + LibraryPhoto* _tmp1_; + gboolean _tmp2_; PhotoMetadata* metadata = NULL; - LibraryPhoto* _tmp7_ = NULL; - PhotoMetadata* _tmp8_ = NULL; - PhotoMetadata* _tmp9_ = NULL; - PhotoMetadata* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + LibraryPhoto* _tmp7_; + PhotoMetadata* _tmp8_; + PhotoMetadata* _tmp9_; + PhotoMetadata* _tmp10_; + gboolean _tmp11_; GError * _inner_error_ = NULL; #line 67 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self)); @@ -4351,12 +4356,12 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* if (!_tmp2_) { #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp0_ = TRUE; -#line 4355 "MetadataWriter.c" +#line 4360 "MetadataWriter.c" } else { - LibraryPhoto* _tmp3_ = NULL; - PhotoFileFormat* _tmp4_ = NULL; - PhotoFileFormat* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + LibraryPhoto* _tmp3_; + PhotoFileFormat* _tmp4_; + PhotoFileFormat* _tmp5_; + gboolean _tmp6_; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp3_ = self->photo; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4369,13 +4374,13 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* _tmp0_ = !_tmp6_; #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (_tmp5_); -#line 4373 "MetadataWriter.c" +#line 4378 "MetadataWriter.c" } #line 68 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp0_) { #line 69 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4379 "MetadataWriter.c" +#line 4384 "MetadataWriter.c" } #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = self->photo; @@ -4389,7 +4394,7 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* g_propagate_error (error, _inner_error_); #line 71 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4393 "MetadataWriter.c" +#line 4398 "MetadataWriter.c" } #line 72 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp9_ = metadata; @@ -4401,10 +4406,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* _tmp11_ = metadata_writer_commit_job_update_metadata (self, _tmp10_, FALSE); #line 74 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp11_) { -#line 4405 "MetadataWriter.c" - LibraryPhoto* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; +#line 4410 "MetadataWriter.c" + LibraryPhoto* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp12_ = self->photo; #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4415,10 +4420,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* library_monitor_blacklist_file (_tmp14_, "MetadataWriter.commit_editable"); #line 75 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp14_); -#line 4419 "MetadataWriter.c" +#line 4424 "MetadataWriter.c" { - LibraryPhoto* _tmp15_ = NULL; - PhotoMetadata* _tmp16_ = NULL; + LibraryPhoto* _tmp15_; + PhotoMetadata* _tmp16_; PhotoReimportEditableState* _tmp17_ = NULL; #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp15_ = self->photo; @@ -4432,15 +4437,15 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* self->reimport_editable_state = _tmp17_; #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4436 "MetadataWriter.c" - goto __finally558; +#line 4441 "MetadataWriter.c" + goto __finally559; } } - __finally558: + __finally559: { - LibraryPhoto* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; + LibraryPhoto* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp18_ = self->photo; #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4451,7 +4456,7 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* library_monitor_unblacklist_file (_tmp20_); #line 79 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp20_); -#line 4455 "MetadataWriter.c" +#line 4460 "MetadataWriter.c" } #line 76 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -4461,14 +4466,14 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob* _media_metadata_unref0 (metadata); #line 76 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return; -#line 4465 "MetadataWriter.c" +#line 4470 "MetadataWriter.c" } } #line 83 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->wrote_editable = TRUE; #line 67 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _media_metadata_unref0 (metadata); -#line 4472 "MetadataWriter.c" +#line 4477 "MetadataWriter.c" } @@ -4476,48 +4481,48 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit gboolean result = FALSE; gboolean changed = FALSE; gchar* current_title = NULL; - LibraryPhoto* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoMetadata* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + LibraryPhoto* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + PhotoMetadata* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gboolean _tmp6_; gchar* current_comment = NULL; - LibraryPhoto* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - PhotoMetadata* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + LibraryPhoto* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + PhotoMetadata* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gboolean _tmp15_; Rating current_rating = 0; - LibraryPhoto* _tmp18_ = NULL; - Rating _tmp19_ = 0; - Rating _tmp20_ = 0; - PhotoMetadata* _tmp21_ = NULL; - Rating _tmp22_ = 0; + LibraryPhoto* _tmp18_; + Rating _tmp19_; + Rating _tmp20_; + PhotoMetadata* _tmp21_; + Rating _tmp22_; time_t current_exposure_time = 0; - LibraryPhoto* _tmp25_ = NULL; - time_t _tmp26_ = 0; + LibraryPhoto* _tmp25_; + time_t _tmp26_; time_t metadata_exposure_time = 0; MetadataDateTime* metadata_exposure_date_time = NULL; - PhotoMetadata* _tmp27_ = NULL; - MetadataDateTime* _tmp28_ = NULL; - MetadataDateTime* _tmp29_ = NULL; - time_t _tmp32_ = 0; - time_t _tmp33_ = 0; + PhotoMetadata* _tmp27_; + MetadataDateTime* _tmp28_; + MetadataDateTime* _tmp29_; + time_t _tmp32_; + time_t _tmp33_; GeeSet* safe_keywords = NULL; - GeeHashSet* _tmp39_ = NULL; - GeeSet* _tmp40_ = NULL; - GeeSet* _tmp53_ = NULL; - PhotoMetadata* _tmp54_ = NULL; - GeeSet* _tmp55_ = NULL; - GeeSet* _tmp56_ = NULL; - gboolean _tmp57_ = FALSE; - gboolean _tmp58_ = FALSE; - gboolean _tmp61_ = FALSE; - gboolean _tmp69_ = FALSE; + GeeHashSet* _tmp39_; + GeeSet* _tmp40_; + GeeSet* _tmp53_; + PhotoMetadata* _tmp54_; + GeeSet* _tmp55_; + GeeSet* _tmp56_; + gboolean _tmp57_; + gboolean _tmp58_; + gboolean _tmp61_; + gboolean _tmp69_; #line 86 "/home/jens/Source/shotwell/src/MetadataWriter.vala" g_return_val_if_fail (METADATA_WRITER_IS_COMMIT_JOB (self), FALSE); #line 86 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4544,9 +4549,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _g_free0 (_tmp5_); #line 91 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp6_) { -#line 4548 "MetadataWriter.c" - PhotoMetadata* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; +#line 4553 "MetadataWriter.c" + PhotoMetadata* _tmp7_; + const gchar* _tmp8_; #line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp7_ = metadata; #line 92 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4555,7 +4560,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit photo_metadata_set_title (_tmp7_, _tmp8_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 93 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4559 "MetadataWriter.c" +#line 4564 "MetadataWriter.c" } #line 97 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp9_ = self->photo; @@ -4577,9 +4582,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _g_free0 (_tmp14_); #line 98 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp15_) { -#line 4581 "MetadataWriter.c" - PhotoMetadata* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; +#line 4586 "MetadataWriter.c" + PhotoMetadata* _tmp16_; + const gchar* _tmp17_; #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp16_ = metadata; #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4588,7 +4593,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit photo_metadata_set_comment (_tmp16_, _tmp17_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 100 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4592 "MetadataWriter.c" +#line 4597 "MetadataWriter.c" } #line 104 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp18_ = self->photo; @@ -4604,9 +4609,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _tmp22_ = photo_metadata_get_rating (_tmp21_); #line 105 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp20_ != _tmp22_) { -#line 4608 "MetadataWriter.c" - PhotoMetadata* _tmp23_ = NULL; - Rating _tmp24_ = 0; +#line 4613 "MetadataWriter.c" + PhotoMetadata* _tmp23_; + Rating _tmp24_; #line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp23_ = metadata; #line 106 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4615,7 +4620,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit photo_metadata_set_rating (_tmp23_, _tmp24_); #line 107 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4619 "MetadataWriter.c" +#line 4624 "MetadataWriter.c" } #line 111 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp25_ = self->photo; @@ -4635,16 +4640,16 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _tmp29_ = metadata_exposure_date_time; #line 114 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp29_ != NULL) { -#line 4639 "MetadataWriter.c" - MetadataDateTime* _tmp30_ = NULL; - time_t _tmp31_ = 0; +#line 4644 "MetadataWriter.c" + MetadataDateTime* _tmp30_; + time_t _tmp31_; #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp30_ = metadata_exposure_date_time; #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp31_ = metadata_date_time_get_timestamp (_tmp30_); #line 115 "/home/jens/Source/shotwell/src/MetadataWriter.vala" metadata_exposure_time = _tmp31_; -#line 4648 "MetadataWriter.c" +#line 4653 "MetadataWriter.c" } #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp32_ = current_exposure_time; @@ -4652,17 +4657,17 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _tmp33_ = metadata_exposure_time; #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp32_ != _tmp33_) { -#line 4656 "MetadataWriter.c" +#line 4661 "MetadataWriter.c" MetadataDateTime* _tmp34_ = NULL; - time_t _tmp35_ = 0; - PhotoMetadata* _tmp38_ = NULL; + time_t _tmp35_; + PhotoMetadata* _tmp38_; #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp35_ = current_exposure_time; #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp35_ != ((time_t) 0)) { -#line 4664 "MetadataWriter.c" - time_t _tmp36_ = 0; - MetadataDateTime* _tmp37_ = NULL; +#line 4669 "MetadataWriter.c" + time_t _tmp36_; + MetadataDateTime* _tmp37_; #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp36_ = current_exposure_time; #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4671,13 +4676,13 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _metadata_date_time_unref0 (_tmp34_); #line 118 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp34_ = _tmp37_; -#line 4675 "MetadataWriter.c" +#line 4680 "MetadataWriter.c" } else { #line 119 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _metadata_date_time_unref0 (_tmp34_); #line 119 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp34_ = NULL; -#line 4681 "MetadataWriter.c" +#line 4686 "MetadataWriter.c" } #line 117 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp38_ = metadata; @@ -4687,7 +4692,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit changed = TRUE; #line 116 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _metadata_date_time_unref0 (_tmp34_); -#line 4691 "MetadataWriter.c" +#line 4696 "MetadataWriter.c" } #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); @@ -4697,11 +4702,11 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _tmp40_ = self->current_keywords; #line 133 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp40_ != NULL) { -#line 4701 "MetadataWriter.c" +#line 4706 "MetadataWriter.c" { GeeIterator* _tmp_it = NULL; - GeeSet* _tmp41_ = NULL; - GeeIterator* _tmp42_ = NULL; + GeeSet* _tmp41_; + GeeIterator* _tmp42_; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp41_ = self->current_keywords; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4710,19 +4715,19 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _tmp_it = _tmp42_; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" while (TRUE) { -#line 4714 "MetadataWriter.c" - GeeIterator* _tmp43_ = NULL; - gboolean _tmp44_ = FALSE; +#line 4719 "MetadataWriter.c" + GeeIterator* _tmp43_; + gboolean _tmp44_; gchar* tmp = NULL; - GeeIterator* _tmp45_ = NULL; - gpointer _tmp46_ = NULL; + GeeIterator* _tmp45_; + gpointer _tmp46_; Tag* tag = NULL; - const gchar* _tmp47_ = NULL; - Tag* _tmp48_ = NULL; - GeeSet* _tmp49_ = NULL; - Tag* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; + const gchar* _tmp47_; + Tag* _tmp48_; + GeeSet* _tmp49_; + Tag* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp43_ = _tmp_it; #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4731,7 +4736,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit if (!_tmp44_) { #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" break; -#line 4735 "MetadataWriter.c" +#line 4740 "MetadataWriter.c" } #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp45_ = _tmp_it; @@ -4761,11 +4766,11 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _g_object_unref0 (tag); #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_free0 (tmp); -#line 4765 "MetadataWriter.c" +#line 4770 "MetadataWriter.c" } #line 134 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _g_object_unref0 (_tmp_it); -#line 4769 "MetadataWriter.c" +#line 4774 "MetadataWriter.c" } } #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4784,9 +4789,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _g_object_unref0 (_tmp56_); #line 140 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp58_) { -#line 4788 "MetadataWriter.c" - PhotoMetadata* _tmp59_ = NULL; - GeeSet* _tmp60_ = NULL; +#line 4793 "MetadataWriter.c" + PhotoMetadata* _tmp59_; + GeeSet* _tmp60_; #line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp59_ = metadata; #line 141 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4795,19 +4800,19 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit photo_metadata_set_keywords (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), PHOTO_METADATA_SET_OPTION_ALL_DOMAINS); #line 142 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4799 "MetadataWriter.c" +#line 4804 "MetadataWriter.c" } #line 146 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp61_ = skip_orientation; #line 146 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (!_tmp61_) { -#line 4805 "MetadataWriter.c" +#line 4810 "MetadataWriter.c" Orientation current_orientation = 0; - LibraryPhoto* _tmp62_ = NULL; - Orientation _tmp63_ = 0; - Orientation _tmp64_ = 0; - PhotoMetadata* _tmp65_ = NULL; - Orientation _tmp66_ = 0; + LibraryPhoto* _tmp62_; + Orientation _tmp63_; + Orientation _tmp64_; + PhotoMetadata* _tmp65_; + Orientation _tmp66_; #line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp62_ = self->photo; #line 147 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4822,9 +4827,9 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _tmp66_ = photo_metadata_get_orientation (_tmp65_); #line 148 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp64_ != _tmp66_) { -#line 4826 "MetadataWriter.c" - PhotoMetadata* _tmp67_ = NULL; - Orientation _tmp68_ = 0; +#line 4831 "MetadataWriter.c" + PhotoMetadata* _tmp67_; + Orientation _tmp68_; #line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp67_ = metadata; #line 149 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4833,20 +4838,20 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit photo_metadata_set_orientation (_tmp67_, _tmp68_); #line 150 "/home/jens/Source/shotwell/src/MetadataWriter.vala" changed = TRUE; -#line 4837 "MetadataWriter.c" +#line 4842 "MetadataWriter.c" } } #line 155 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp69_ = changed; #line 155 "/home/jens/Source/shotwell/src/MetadataWriter.vala" if (_tmp69_) { -#line 4844 "MetadataWriter.c" - PhotoMetadata* _tmp70_ = NULL; +#line 4849 "MetadataWriter.c" + PhotoMetadata* _tmp70_; #line 156 "/home/jens/Source/shotwell/src/MetadataWriter.vala" _tmp70_ = metadata; #line 156 "/home/jens/Source/shotwell/src/MetadataWriter.vala" photo_metadata_set_software (_tmp70_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION); -#line 4850 "MetadataWriter.c" +#line 4855 "MetadataWriter.c" } #line 158 "/home/jens/Source/shotwell/src/MetadataWriter.vala" result = changed; @@ -4860,7 +4865,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit _g_free0 (current_title); #line 158 "/home/jens/Source/shotwell/src/MetadataWriter.vala" return result; -#line 4864 "MetadataWriter.c" +#line 4869 "MetadataWriter.c" } @@ -4870,8 +4875,8 @@ static void metadata_writer_commit_job_class_init (MetadataWriterCommitJobClass #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" ((BackgroundJobClass *) klass)->finalize = metadata_writer_commit_job_finalize; #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) metadata_writer_commit_job_real_execute; -#line 4875 "MetadataWriter.c" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) metadata_writer_commit_job_real_execute; +#line 4880 "MetadataWriter.c" } @@ -4886,11 +4891,11 @@ static void metadata_writer_commit_job_instance_init (MetadataWriterCommitJob * self->wrote_master = FALSE; #line 27 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->wrote_editable = FALSE; -#line 4890 "MetadataWriter.c" +#line 4895 "MetadataWriter.c" } -static void metadata_writer_commit_job_finalize (BackgroundJob* obj) { +static void metadata_writer_commit_job_finalize (BackgroundJob * obj) { MetadataWriterCommitJob * self; #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, METADATA_WRITER_TYPE_COMMIT_JOB, MetadataWriterCommitJob); @@ -4906,7 +4911,7 @@ static void metadata_writer_commit_job_finalize (BackgroundJob* obj) { _g_error_free0 (self->err); #line 20 "/home/jens/Source/shotwell/src/MetadataWriter.vala" BACKGROUND_JOB_CLASS (metadata_writer_commit_job_parent_class)->finalize (obj); -#line 4910 "MetadataWriter.c" +#line 4915 "MetadataWriter.c" } @@ -4930,17 +4935,17 @@ static void metadata_writer_class_init (MetadataWriterClass * klass) { #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" G_OBJECT_CLASS (klass)->finalize = metadata_writer_finalize; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" - g_signal_new ("progress", TYPE_METADATA_WRITER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); -#line 4935 "MetadataWriter.c" + metadata_writer_signals[METADATA_WRITER_PROGRESS_SIGNAL] = g_signal_new ("progress", TYPE_METADATA_WRITER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); +#line 4940 "MetadataWriter.c" } static void metadata_writer_instance_init (MetadataWriter * self) { - Workers* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; - GeeHashSet* _tmp2_ = NULL; - GeeHashSet* _tmp3_ = NULL; - GeeHashSet* _tmp4_ = NULL; + Workers* _tmp0_; + GeeHashMap* _tmp1_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp3_; + GeeHashSet* _tmp4_; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv = METADATA_WRITER_GET_PRIVATE (self); #line 164 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -4975,48 +4980,48 @@ static void metadata_writer_instance_init (MetadataWriter * self) { _tmp4_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 175 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self->priv->importing_photos = _tmp4_; -#line 4979 "MetadataWriter.c" +#line 4984 "MetadataWriter.c" } -static void metadata_writer_finalize (GObject* obj) { +static void metadata_writer_finalize (GObject * obj) { MetadataWriter * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - guint _tmp2_ = 0U; - LibraryPhotoSourceCollection* _tmp3_ = NULL; - guint _tmp4_ = 0U; - LibraryPhotoSourceCollection* _tmp5_ = NULL; - guint _tmp6_ = 0U; - LibraryPhotoSourceCollection* _tmp7_ = NULL; - guint _tmp8_ = 0U; - LibraryPhotoSourceCollection* _tmp9_ = NULL; - guint _tmp10_ = 0U; - LibraryPhotoSourceCollection* _tmp11_ = NULL; - guint _tmp12_ = 0U; - LibraryPhotoSourceCollection* _tmp13_ = NULL; - guint _tmp14_ = 0U; - LibraryPhotoSourceCollection* _tmp15_ = NULL; - guint _tmp16_ = 0U; - TagSourceCollection* _tmp17_ = NULL; - guint _tmp18_ = 0U; - TagSourceCollection* _tmp19_ = NULL; - guint _tmp20_ = 0U; - TagSourceCollection* _tmp21_ = NULL; - guint _tmp22_ = 0U; - TagSourceCollection* _tmp23_ = NULL; - guint _tmp24_ = 0U; - TagSourceCollection* _tmp25_ = NULL; - guint _tmp26_ = 0U; - Application* _tmp27_ = NULL; - Application* _tmp28_ = NULL; - guint _tmp29_ = 0U; - LibraryMonitorPool* _tmp30_ = NULL; - LibraryMonitorPool* _tmp31_ = NULL; - guint _tmp32_ = 0U; - LibraryMonitorPool* _tmp33_ = NULL; - LibraryMonitorPool* _tmp34_ = NULL; - guint _tmp35_ = 0U; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + guint _tmp2_; + LibraryPhotoSourceCollection* _tmp3_; + guint _tmp4_; + LibraryPhotoSourceCollection* _tmp5_; + guint _tmp6_; + LibraryPhotoSourceCollection* _tmp7_; + guint _tmp8_; + LibraryPhotoSourceCollection* _tmp9_; + guint _tmp10_; + LibraryPhotoSourceCollection* _tmp11_; + guint _tmp12_; + LibraryPhotoSourceCollection* _tmp13_; + guint _tmp14_; + LibraryPhotoSourceCollection* _tmp15_; + guint _tmp16_; + TagSourceCollection* _tmp17_; + guint _tmp18_; + TagSourceCollection* _tmp19_; + guint _tmp20_; + TagSourceCollection* _tmp21_; + guint _tmp22_; + TagSourceCollection* _tmp23_; + guint _tmp24_; + TagSourceCollection* _tmp25_; + guint _tmp26_; + Application* _tmp27_; + Application* _tmp28_; + guint _tmp29_; + LibraryMonitorPool* _tmp30_; + LibraryMonitorPool* _tmp31_; + guint _tmp32_; + LibraryMonitorPool* _tmp33_; + LibraryMonitorPool* _tmp34_; + guint _tmp35_; #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_METADATA_WRITER, MetadataWriter); #line 220 "/home/jens/Source/shotwell/src/MetadataWriter.vala" @@ -5147,7 +5152,7 @@ static void metadata_writer_finalize (GObject* obj) { _g_object_unref0 (self->priv->importing_photos); #line 14 "/home/jens/Source/shotwell/src/MetadataWriter.vala" G_OBJECT_CLASS (metadata_writer_parent_class)->finalize (obj); -#line 5151 "MetadataWriter.c" +#line 5156 "MetadataWriter.c" } |