diff options
Diffstat (limited to 'src/LibraryMonitor.c')
| -rw-r--r-- | src/LibraryMonitor.c | 3374 |
1 files changed, 1604 insertions, 1770 deletions
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c index a1234fb..7cc9ef6 100644 --- a/src/LibraryMonitor.c +++ b/src/LibraryMonitor.c @@ -1,4 +1,4 @@ -/* LibraryMonitor.c generated by valac 0.34.7, the Vala compiler +/* LibraryMonitor.c generated by valac 0.36.6, the Vala compiler * generated from LibraryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -70,6 +70,12 @@ typedef struct _LibraryMonitorClass LibraryMonitorClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _library_monitor_pool_unref0(var) ((var == NULL) ? NULL : (var = (library_monitor_pool_unref (var), NULL))) typedef struct _ParamSpecLibraryMonitorPool ParamSpecLibraryMonitorPool; +enum { + LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL, + LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL, + LIBRARY_MONITOR_POOL_LAST_SIGNAL +}; +static guint library_monitor_pool_signals[LIBRARY_MONITOR_POOL_LAST_SIGNAL] = {0}; typedef struct _DirectoryMonitorPrivate DirectoryMonitorPrivate; typedef struct _LibraryMonitorPrivate LibraryMonitorPrivate; @@ -439,6 +445,13 @@ typedef struct _TombstoneClass TombstoneClass; typedef struct _AbstractSemaphore AbstractSemaphore; typedef struct _AbstractSemaphoreClass AbstractSemaphoreClass; typedef struct _LibraryMonitorParamSpecVerifyJob LibraryMonitorParamSpecVerifyJob; +enum { + LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL, + LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL, + LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL, + LIBRARY_MONITOR_LAST_SIGNAL +}; +static guint library_monitor_signals[LIBRARY_MONITOR_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; } @@ -567,7 +580,9 @@ struct _LibraryMonitorAsyncDiscoveryCompletedData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; LibraryMonitor* self; GeeHashSet* _tmp0_; gint _tmp1_; @@ -696,7 +711,9 @@ struct _LibraryMonitorVerifyMonitorableData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; LibraryMonitor* self; Monitorable* monitorable; MediaMonitor* monitor; @@ -912,7 +929,7 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer self); void directory_monitor_close (DirectoryMonitor* self); void directory_monitor_start_discovery (DirectoryMonitor* self); -static void library_monitor_pool_finalize (LibraryMonitorPool* obj); +static void library_monitor_pool_finalize (LibraryMonitorPool * obj); gpointer workers_ref (gpointer instance); void workers_unref (gpointer instance); GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -1011,7 +1028,7 @@ MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollectio void media_monitor_notify_discovery_started (MediaMonitor* self); static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* file, GFileInfo* info); GType media_monitor_discovered_file_get_type (void) G_GNUC_CONST; -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable); +MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); GType tombstone_source_collection_get_type (void) G_GNUC_CONST; gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, GFile* file); static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file); @@ -1019,6 +1036,7 @@ static void library_monitor_real_discovery_completed (DirectoryMonitor* base); static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_); static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_); static void library_monitor_async_discovery_completed_data_free (gpointer _data); +static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_); static void library_monitor_discovery_stage_completed (LibraryMonitor* self); GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file); @@ -1062,10 +1080,11 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self); static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_); static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_); static void library_monitor_verify_monitorable_data_free (gpointer _data); +static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_); GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable); GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); -static void _vala_array_add130 (GFile*** array, int* length, int* size, GFile* value); +static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value); #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value" #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES #define DIRECTORY_MONITOR_FILE_INFO_FLAGS G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS @@ -1192,18 +1211,18 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base); GFile* media_source_get_master_file (MediaSource* self); gchar* md5_file (GFile* file, GError** error); gchar* media_source_get_master_md5 (MediaSource* self); -static void library_monitor_find_move_job_finalize (BackgroundJob* obj); +static void library_monitor_find_move_job_finalize (BackgroundJob * obj); enum { LIBRARY_MONITOR_RUNTIME_FIND_MOVE_JOB_DUMMY_PROPERTY }; static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self); static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base); -static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj); +static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj); enum { LIBRARY_MONITOR_VERIFY_JOB_DUMMY_PROPERTY }; -static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj); -static void library_monitor_finalize (GObject* obj); +static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj); +static void library_monitor_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1214,14 +1233,14 @@ static LibraryMonitorPool* library_monitor_pool_construct (GType object_type) { self = (LibraryMonitorPool*) g_type_create_instance (object_type); #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 1218 "LibraryMonitor.c" +#line 1237 "LibraryMonitor.c" } static LibraryMonitorPool* library_monitor_pool_new (void) { #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_pool_construct (TYPE_LIBRARY_MONITOR_POOL); -#line 1225 "LibraryMonitor.c" +#line 1244 "LibraryMonitor.c" } @@ -1230,52 +1249,52 @@ void library_monitor_pool_init (void) { void library_monitor_pool_terminate (void) { - LibraryMonitorPool* _tmp0_ = NULL; + LibraryMonitorPool* _tmp0_; #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_pool_instance; #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ != NULL) { -#line 1239 "LibraryMonitor.c" - LibraryMonitorPool* _tmp1_ = NULL; +#line 1258 "LibraryMonitor.c" + LibraryMonitorPool* _tmp1_; #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_pool_instance; #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_close (_tmp1_); -#line 1245 "LibraryMonitor.c" +#line 1264 "LibraryMonitor.c" } #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _library_monitor_pool_unref0 (library_monitor_pool_instance); #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_instance = NULL; -#line 1251 "LibraryMonitor.c" +#line 1270 "LibraryMonitor.c" } static gpointer _library_monitor_pool_ref0 (gpointer self) { #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? library_monitor_pool_ref (self) : NULL; -#line 1258 "LibraryMonitor.c" +#line 1277 "LibraryMonitor.c" } LibraryMonitorPool* library_monitor_pool_get_instance (void) { LibraryMonitorPool* result = NULL; - LibraryMonitorPool* _tmp0_ = NULL; - LibraryMonitorPool* _tmp2_ = NULL; - LibraryMonitorPool* _tmp3_ = NULL; + LibraryMonitorPool* _tmp0_; + LibraryMonitorPool* _tmp2_; + LibraryMonitorPool* _tmp3_; #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_pool_instance; #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ == NULL) { -#line 1271 "LibraryMonitor.c" - LibraryMonitorPool* _tmp1_ = NULL; +#line 1290 "LibraryMonitor.c" + LibraryMonitorPool* _tmp1_; #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_pool_new (); #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _library_monitor_pool_unref0 (library_monitor_pool_instance); #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_instance = _tmp1_; -#line 1279 "LibraryMonitor.c" +#line 1298 "LibraryMonitor.c" } #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = library_monitor_pool_instance; @@ -1285,21 +1304,21 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { result = _tmp3_; #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1289 "LibraryMonitor.c" +#line 1308 "LibraryMonitor.c" } static gpointer _g_object_ref0 (gpointer self) { #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 1296 "LibraryMonitor.c" +#line 1315 "LibraryMonitor.c" } LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { LibraryMonitor* result = NULL; - LibraryMonitor* _tmp0_ = NULL; - LibraryMonitor* _tmp1_ = NULL; + LibraryMonitor* _tmp0_; + LibraryMonitor* _tmp1_; #line 58 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR_POOL (self), NULL); #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1310,7 +1329,7 @@ LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { result = _tmp1_; #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1314 "LibraryMonitor.c" +#line 1333 "LibraryMonitor.c" } @@ -1319,16 +1338,16 @@ static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer se result = library_monitor_pool_on_start_monitor ((LibraryMonitorPool*) self); #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1323 "LibraryMonitor.c" +#line 1342 "LibraryMonitor.c" } void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay) { - LibraryMonitor* _tmp0_ = NULL; - LibraryMonitor* _tmp1_ = NULL; + LibraryMonitor* _tmp0_; + LibraryMonitor* _tmp1_; gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; - LibraryMonitor* _tmp7_ = NULL; + gint _tmp3_; + LibraryMonitor* _tmp7_; #line 63 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR_POOL (self)); #line 63 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1347,46 +1366,46 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep _tmp3_ = start_msec_delay; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp3_ > 0) { -#line 1351 "LibraryMonitor.c" - guint _tmp4_ = 0U; +#line 1370 "LibraryMonitor.c" + guint _tmp4_; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->timer_id; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = _tmp4_ == ((guint) 0); -#line 1357 "LibraryMonitor.c" +#line 1376 "LibraryMonitor.c" } else { #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = FALSE; -#line 1361 "LibraryMonitor.c" +#line 1380 "LibraryMonitor.c" } #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp2_) { -#line 1365 "LibraryMonitor.c" - gint _tmp5_ = 0; - guint _tmp6_ = 0U; +#line 1384 "LibraryMonitor.c" + gint _tmp5_; + guint _tmp6_; #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = start_msec_delay; #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _library_monitor_pool_on_start_monitor_gsource_func, library_monitor_pool_ref (self), library_monitor_pool_unref); #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->timer_id = _tmp6_; -#line 1374 "LibraryMonitor.c" +#line 1393 "LibraryMonitor.c" } #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = self->priv->monitor; #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (self, "monitor-installed", _tmp7_); -#line 1380 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp7_); +#line 1399 "LibraryMonitor.c" } static void library_monitor_pool_close (LibraryMonitorPool* self) { - LibraryMonitor* _tmp0_ = NULL; - LibraryMonitor* _tmp1_ = NULL; + LibraryMonitor* _tmp0_; + LibraryMonitor* _tmp1_; LibraryMonitor* closed = NULL; - LibraryMonitor* _tmp2_ = NULL; - LibraryMonitor* _tmp3_ = NULL; - LibraryMonitor* _tmp4_ = NULL; + LibraryMonitor* _tmp2_; + LibraryMonitor* _tmp3_; + LibraryMonitor* _tmp4_; #line 73 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR_POOL (self)); #line 74 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1395,7 +1414,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { if (_tmp0_ == NULL) { #line 75 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 1399 "LibraryMonitor.c" +#line 1418 "LibraryMonitor.c" } #line 77 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1414,17 +1433,17 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { #line 81 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = closed; #line 81 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (self, "monitor-destroyed", _tmp4_); + g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL], 0, _tmp4_); #line 73 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (closed); -#line 1421 "LibraryMonitor.c" +#line 1440 "LibraryMonitor.c" } static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) { gboolean result = FALSE; - LibraryMonitor* _tmp0_ = NULL; - LibraryMonitor* _tmp1_ = NULL; + LibraryMonitor* _tmp0_; + LibraryMonitor* _tmp1_; #line 84 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR_POOL (self), FALSE); #line 86 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1437,7 +1456,7 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) result = FALSE; #line 89 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1441 "LibraryMonitor.c" +#line 1460 "LibraryMonitor.c" } #line 91 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1447,14 +1466,14 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) result = FALSE; #line 93 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1451 "LibraryMonitor.c" +#line 1470 "LibraryMonitor.c" } static void value_library_monitor_pool_init (GValue* value) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1458 "LibraryMonitor.c" +#line 1477 "LibraryMonitor.c" } @@ -1463,7 +1482,7 @@ static void value_library_monitor_pool_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_unref (value->data[0].v_pointer); -#line 1467 "LibraryMonitor.c" +#line 1486 "LibraryMonitor.c" } } @@ -1473,11 +1492,11 @@ static void value_library_monitor_pool_copy_value (const GValue* src_value, GVal if (src_value->data[0].v_pointer) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = library_monitor_pool_ref (src_value->data[0].v_pointer); -#line 1477 "LibraryMonitor.c" +#line 1496 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 1481 "LibraryMonitor.c" +#line 1500 "LibraryMonitor.c" } } @@ -1485,66 +1504,66 @@ static void value_library_monitor_pool_copy_value (const GValue* src_value, GVal static gpointer value_library_monitor_pool_peek_pointer (const GValue* value) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 1489 "LibraryMonitor.c" +#line 1508 "LibraryMonitor.c" } static gchar* value_library_monitor_pool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (collect_values[0].v_pointer) { -#line 1496 "LibraryMonitor.c" - LibraryMonitorPool* object; +#line 1515 "LibraryMonitor.c" + LibraryMonitorPool * object; object = collect_values[0].v_pointer; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1503 "LibraryMonitor.c" +#line 1522 "LibraryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1507 "LibraryMonitor.c" +#line 1526 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_pool_ref (object); -#line 1511 "LibraryMonitor.c" +#line 1530 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1515 "LibraryMonitor.c" +#line 1534 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1519 "LibraryMonitor.c" +#line 1538 "LibraryMonitor.c" } static gchar* value_library_monitor_pool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - LibraryMonitorPool** object_p; + LibraryMonitorPool ** object_p; object_p = collect_values[0].v_pointer; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!object_p) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1530 "LibraryMonitor.c" +#line 1549 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!value->data[0].v_pointer) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = NULL; -#line 1536 "LibraryMonitor.c" +#line 1555 "LibraryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 1540 "LibraryMonitor.c" +#line 1559 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_pool_ref (value->data[0].v_pointer); -#line 1544 "LibraryMonitor.c" +#line 1563 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1548 "LibraryMonitor.c" +#line 1567 "LibraryMonitor.c" } @@ -1558,7 +1577,7 @@ GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nic G_PARAM_SPEC (spec)->value_type = object_type; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return G_PARAM_SPEC (spec); -#line 1562 "LibraryMonitor.c" +#line 1581 "LibraryMonitor.c" } @@ -1567,12 +1586,12 @@ gpointer value_get_library_monitor_pool (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL), NULL); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 1571 "LibraryMonitor.c" +#line 1590 "LibraryMonitor.c" } void value_set_library_monitor_pool (GValue* value, gpointer v_object) { - LibraryMonitorPool* old; + LibraryMonitorPool * old; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL)); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1587,23 +1606,23 @@ void value_set_library_monitor_pool (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_ref (value->data[0].v_pointer); -#line 1591 "LibraryMonitor.c" +#line 1610 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1595 "LibraryMonitor.c" +#line 1614 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_unref (old); -#line 1601 "LibraryMonitor.c" +#line 1620 "LibraryMonitor.c" } } void value_take_library_monitor_pool (GValue* value, gpointer v_object) { - LibraryMonitorPool* old; + LibraryMonitorPool * old; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL)); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1616,17 +1635,17 @@ void value_take_library_monitor_pool (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = v_object; -#line 1620 "LibraryMonitor.c" +#line 1639 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1624 "LibraryMonitor.c" +#line 1643 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_unref (old); -#line 1630 "LibraryMonitor.c" +#line 1649 "LibraryMonitor.c" } } @@ -1639,10 +1658,10 @@ static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_class_add_private (klass, sizeof (LibraryMonitorPoolPrivate)); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_new ("monitor_installed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR); + library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL] = g_signal_new ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_new ("monitor_destroyed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR); -#line 1646 "LibraryMonitor.c" + library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL] = g_signal_new ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR); +#line 1665 "LibraryMonitor.c" } @@ -1655,11 +1674,11 @@ static void library_monitor_pool_instance_init (LibraryMonitorPool * self) { self->priv->timer_id = (guint) 0; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->ref_count = 1; -#line 1659 "LibraryMonitor.c" +#line 1678 "LibraryMonitor.c" } -static void library_monitor_pool_finalize (LibraryMonitorPool* obj) { +static void library_monitor_pool_finalize (LibraryMonitorPool * obj) { LibraryMonitorPool * self; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_MONITOR_POOL, LibraryMonitorPool); @@ -1667,7 +1686,7 @@ static void library_monitor_pool_finalize (LibraryMonitorPool* obj) { g_signal_handlers_destroy (self); #line 31 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->monitor); -#line 1671 "LibraryMonitor.c" +#line 1690 "LibraryMonitor.c" } @@ -1686,18 +1705,18 @@ GType library_monitor_pool_get_type (void) { gpointer library_monitor_pool_ref (gpointer instance) { - LibraryMonitorPool* self; + LibraryMonitorPool * self; self = instance; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 1696 "LibraryMonitor.c" +#line 1715 "LibraryMonitor.c" } void library_monitor_pool_unref (gpointer instance) { - LibraryMonitorPool* self; + LibraryMonitorPool * self; self = instance; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1705,7 +1724,7 @@ void library_monitor_pool_unref (gpointer instance) { LIBRARY_MONITOR_POOL_GET_CLASS (self)->finalize (self); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1709 "LibraryMonitor.c" +#line 1728 "LibraryMonitor.c" } } @@ -1713,7 +1732,7 @@ void library_monitor_pool_unref (gpointer instance) { static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self) { #line 247 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_config_changed ((LibraryMonitor*) self); -#line 1717 "LibraryMonitor.c" +#line 1736 "LibraryMonitor.c" } @@ -1722,7 +1741,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1726 "LibraryMonitor.c" +#line 1745 "LibraryMonitor.c" } @@ -1731,14 +1750,14 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1735 "LibraryMonitor.c" +#line 1754 "LibraryMonitor.c" } static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self) { #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_unblacklist_file ((GFile*) item); -#line 1742 "LibraryMonitor.c" +#line 1761 "LibraryMonitor.c" } @@ -1747,21 +1766,21 @@ static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer se result = library_monitor_on_flush_import_queue ((LibraryMonitor*) self); #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1751 "LibraryMonitor.c" +#line 1770 "LibraryMonitor.c" } LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) { LibraryMonitor * self = NULL; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - ConfigFacade* _tmp3_ = NULL; - ConfigFacade* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - ConfigFacade* _tmp6_ = NULL; - ConfigFacade* _tmp7_ = NULL; - guint _tmp8_ = 0U; + GFile* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + ConfigFacade* _tmp3_; + ConfigFacade* _tmp4_; + gboolean _tmp5_; + ConfigFacade* _tmp6_; + ConfigFacade* _tmp7_; + guint _tmp8_; #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_IS_FILE (root), NULL); #line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1796,36 +1815,36 @@ LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gbool self->priv->import_queue_timer_id = _tmp8_; #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 1800 "LibraryMonitor.c" +#line 1819 "LibraryMonitor.c" } LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) { #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_construct (TYPE_LIBRARY_MONITOR, root, recurse, monitoring); -#line 1807 "LibraryMonitor.c" +#line 1826 "LibraryMonitor.c" } static void library_monitor_real_close (DirectoryMonitor* base) { LibraryMonitor * self; - GCancellable* _tmp0_ = NULL; - guint _tmp13_ = 0U; + GCancellable* _tmp0_; + guint _tmp13_; #line 250 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->cancellable; #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 1821 "LibraryMonitor.c" +#line 1840 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _monitor_size = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _monitor_index = 0; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitors; @@ -1845,15 +1864,15 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _monitor_index = -1; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 1849 "LibraryMonitor.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 1868 "LibraryMonitor.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; MediaMonitor* monitor = NULL; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; - MediaMonitor* _tmp12_ = NULL; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + MediaMonitor* _tmp12_; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = _monitor_index; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1866,7 +1885,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { if (!(_tmp7_ < _tmp8_)) { #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 1870 "LibraryMonitor.c" +#line 1889 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = _monitor_list; @@ -1882,41 +1901,41 @@ static void library_monitor_real_close (DirectoryMonitor* base) { media_monitor_close (_tmp12_); #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 1886 "LibraryMonitor.c" +#line 1905 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 1890 "LibraryMonitor.c" +#line 1909 "LibraryMonitor.c" } #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = self->priv->import_queue_timer_id; #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp13_ != ((guint) 0)) { -#line 1896 "LibraryMonitor.c" - guint _tmp14_ = 0U; +#line 1915 "LibraryMonitor.c" + guint _tmp14_; #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = self->priv->import_queue_timer_id; #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_source_remove (_tmp14_); #line 258 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; -#line 1904 "LibraryMonitor.c" +#line 1923 "LibraryMonitor.c" } #line 261 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 1908 "LibraryMonitor.c" +#line 1927 "LibraryMonitor.c" } static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaMonitor* monitor, Monitorable* monitorable) { - GeeHashMap* _tmp0_ = NULL; - MediaMonitor* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashMap* _tmp7_ = NULL; - MediaMonitor* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeSet* _tmp10_ = NULL; - Monitorable* _tmp11_ = NULL; + GeeHashMap* _tmp0_; + MediaMonitor* _tmp1_; + gboolean _tmp2_; + GeeHashMap* _tmp7_; + MediaMonitor* _tmp8_; + gpointer _tmp9_; + GeeSet* _tmp10_; + Monitorable* _tmp11_; #line 264 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 264 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1931,11 +1950,11 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp2_) { -#line 1935 "LibraryMonitor.c" - GeeHashMap* _tmp3_ = NULL; - MediaMonitor* _tmp4_ = NULL; - GeeHashSet* _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; +#line 1954 "LibraryMonitor.c" + GeeHashMap* _tmp3_; + MediaMonitor* _tmp4_; + GeeHashSet* _tmp5_; + GeeHashSet* _tmp6_; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = self->priv->discovered; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1948,7 +1967,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SET, GeeSet)); #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_tmp6_); -#line 1952 "LibraryMonitor.c" +#line 1971 "LibraryMonitor.c" } #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = self->priv->discovered; @@ -1964,28 +1983,28 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_); #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_tmp10_); -#line 1968 "LibraryMonitor.c" +#line 1987 "LibraryMonitor.c" } static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, Monitorable* monitorable) { MediaMonitor* result = NULL; - Monitorable* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + Monitorable* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (self), NULL); #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); -#line 1981 "LibraryMonitor.c" +#line 2000 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->monitors; @@ -2005,20 +2024,20 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor _monitor_index = -1; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2009 "LibraryMonitor.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 2028 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; - MediaMonitor* _tmp11_ = NULL; - MediaSourceCollection* _tmp12_ = NULL; - MediaSourceCollection* _tmp13_ = NULL; - Monitorable* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; + MediaSourceCollection* _tmp12_; + MediaSourceCollection* _tmp13_; + Monitorable* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2031,7 +2050,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor if (!(_tmp6_ < _tmp7_)) { #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2035 "LibraryMonitor.c" +#line 2054 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2063,15 +2082,15 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor _g_object_unref0 (_monitor_list); #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 2067 "LibraryMonitor.c" +#line 2086 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2071 "LibraryMonitor.c" +#line 2090 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2075 "LibraryMonitor.c" +#line 2094 "LibraryMonitor.c" } #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = monitorable; @@ -2083,25 +2102,25 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp19_); #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp19_); -#line 2087 "LibraryMonitor.c" +#line 2106 "LibraryMonitor.c" } static void library_monitor_real_discovery_started (DirectoryMonitor* base) { LibraryMonitor * self; - GeeHashMap* _tmp28_ = NULL; - GeeHashSet* _tmp29_ = NULL; + GeeHashMap* _tmp28_; + GeeHashSet* _tmp29_; #line 280 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); -#line 2097 "LibraryMonitor.c" +#line 2116 "LibraryMonitor.c" { GeeIterator* _collection_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = media_collection_registry_get_instance (); #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2122,18 +2141,18 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _collection_it = _tmp5_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2126 "LibraryMonitor.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 2145 "LibraryMonitor.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* collection = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GeeList* _tmp10_ = NULL; - MediaSourceCollection* _tmp11_ = NULL; - Workers* _tmp12_ = NULL; - GCancellable* _tmp13_ = NULL; - MediaMonitor* _tmp14_ = NULL; - MediaMonitor* _tmp15_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + GeeList* _tmp10_; + MediaSourceCollection* _tmp11_; + Workers* _tmp12_; + GCancellable* _tmp13_; + MediaMonitor* _tmp14_; + MediaMonitor* _tmp15_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = _collection_it; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2142,7 +2161,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { if (!_tmp7_) { #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2146 "LibraryMonitor.c" +#line 2165 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _collection_it; @@ -2168,20 +2187,20 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _g_object_unref0 (_tmp15_); #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_collection_unref0 (collection); -#line 2172 "LibraryMonitor.c" +#line 2191 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_collection_it); -#line 2176 "LibraryMonitor.c" +#line 2195 "LibraryMonitor.c" } { GeeList* _monitor_list = NULL; - GeeList* _tmp16_ = NULL; - GeeList* _tmp17_ = NULL; + GeeList* _tmp16_; + GeeList* _tmp17_; gint _monitor_size = 0; - GeeList* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; + GeeList* _tmp18_; + gint _tmp19_; + gint _tmp20_; gint _monitor_index = 0; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = self->priv->monitors; @@ -2201,15 +2220,15 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _monitor_index = -1; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2205 "LibraryMonitor.c" - gint _tmp21_ = 0; - gint _tmp22_ = 0; - gint _tmp23_ = 0; +#line 2224 "LibraryMonitor.c" + gint _tmp21_; + gint _tmp22_; + gint _tmp23_; MediaMonitor* monitor = NULL; - GeeList* _tmp24_ = NULL; - gint _tmp25_ = 0; - gpointer _tmp26_ = NULL; - MediaMonitor* _tmp27_ = NULL; + GeeList* _tmp24_; + gint _tmp25_; + gpointer _tmp26_; + MediaMonitor* _tmp27_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2222,7 +2241,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { if (!(_tmp22_ < _tmp23_)) { #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2226 "LibraryMonitor.c" +#line 2245 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp24_ = _monitor_list; @@ -2238,11 +2257,11 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { media_monitor_notify_discovery_started (_tmp27_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2242 "LibraryMonitor.c" +#line 2261 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2246 "LibraryMonitor.c" +#line 2265 "LibraryMonitor.c" } #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -2258,7 +2277,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { self->priv->unknown_files = _tmp29_; #line 290 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_started (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 2262 "LibraryMonitor.c" +#line 2281 "LibraryMonitor.c" } @@ -2267,9 +2286,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* Monitorable* representation = NULL; MediaMonitor* representing = NULL; gboolean ignore = FALSE; - MediaMonitor* _tmp20_ = NULL; - GFile* _tmp36_ = NULL; - GFileInfo* _tmp37_ = NULL; + MediaMonitor* _tmp20_; + GFile* _tmp36_; + GFileInfo* _tmp37_; #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2282,15 +2301,15 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* representing = NULL; #line 296 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ignore = FALSE; -#line 2286 "LibraryMonitor.c" +#line 2305 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->monitors; @@ -2310,21 +2329,21 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _monitor_index = -1; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2314 "LibraryMonitor.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 2333 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; MediaMonitorDiscoveredFile _result_ = 0; - MediaMonitor* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFileInfo* _tmp13_ = NULL; + MediaMonitor* _tmp11_; + GFile* _tmp12_; + GFileInfo* _tmp13_; Monitorable* _tmp14_ = NULL; - MediaMonitorDiscoveredFile _tmp15_ = 0; - MediaMonitorDiscoveredFile _tmp16_ = 0; + MediaMonitorDiscoveredFile _tmp15_; + MediaMonitorDiscoveredFile _tmp16_; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2337,7 +2356,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* if (!(_tmp6_ < _tmp7_)) { #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2341 "LibraryMonitor.c" +#line 2360 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2365,9 +2384,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _tmp16_ = _result_; #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp16_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { -#line 2369 "LibraryMonitor.c" - MediaMonitor* _tmp17_ = NULL; - MediaMonitor* _tmp18_ = NULL; +#line 2388 "LibraryMonitor.c" + MediaMonitor* _tmp17_; + MediaMonitor* _tmp18_; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = monitor; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2380,9 +2399,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _g_object_unref0 (monitor); #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2384 "LibraryMonitor.c" +#line 2403 "LibraryMonitor.c" } else { - MediaMonitorDiscoveredFile _tmp19_ = 0; + MediaMonitorDiscoveredFile _tmp19_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = _result_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2393,41 +2412,41 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _g_object_unref0 (monitor); #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2397 "LibraryMonitor.c" +#line 2416 "LibraryMonitor.c" } } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2402 "LibraryMonitor.c" +#line 2421 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2406 "LibraryMonitor.c" +#line 2425 "LibraryMonitor.c" } #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp20_ = representing; #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp20_ != NULL) { -#line 2412 "LibraryMonitor.c" +#line 2431 "LibraryMonitor.c" gboolean _tmp21_ = FALSE; - Monitorable* _tmp22_ = NULL; - MediaMonitor* _tmp24_ = NULL; - Monitorable* _tmp25_ = NULL; + Monitorable* _tmp22_; + MediaMonitor* _tmp24_; + Monitorable* _tmp25_; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp22_ = representation; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp22_ != NULL) { -#line 2421 "LibraryMonitor.c" - gboolean _tmp23_ = FALSE; +#line 2440 "LibraryMonitor.c" + gboolean _tmp23_; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp23_ = ignore; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = !_tmp23_; -#line 2427 "LibraryMonitor.c" +#line 2446 "LibraryMonitor.c" } else { #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = FALSE; -#line 2431 "LibraryMonitor.c" +#line 2450 "LibraryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _vala_assert (_tmp21_, "representation != null && !ignore"); @@ -2437,19 +2456,19 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _tmp25_ = representation; #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_add_to_discovered_list (self, _tmp24_, _tmp25_); -#line 2441 "LibraryMonitor.c" +#line 2460 "LibraryMonitor.c" } else { gboolean _tmp26_ = FALSE; gboolean _tmp27_ = FALSE; - gboolean _tmp28_ = FALSE; + gboolean _tmp28_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = ignore; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp28_) { -#line 2450 "LibraryMonitor.c" - TombstoneSourceCollection* _tmp29_ = NULL; - GFile* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; +#line 2469 "LibraryMonitor.c" + TombstoneSourceCollection* _tmp29_; + GFile* _tmp30_; + gboolean _tmp31_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp29_ = tombstone_global; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2458,41 +2477,41 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _tmp31_ = tombstone_source_collection_matches (_tmp29_, _tmp30_); #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = !_tmp31_; -#line 2462 "LibraryMonitor.c" +#line 2481 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = FALSE; -#line 2466 "LibraryMonitor.c" +#line 2485 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp27_) { -#line 2470 "LibraryMonitor.c" - GFile* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; +#line 2489 "LibraryMonitor.c" + GFile* _tmp32_; + gboolean _tmp33_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp32_ = file; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp33_ = library_monitor_is_supported_filetype (self, _tmp32_); #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = _tmp33_; -#line 2479 "LibraryMonitor.c" +#line 2498 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = FALSE; -#line 2483 "LibraryMonitor.c" +#line 2502 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp26_) { -#line 2487 "LibraryMonitor.c" - GeeHashSet* _tmp34_ = NULL; - GFile* _tmp35_ = NULL; +#line 2506 "LibraryMonitor.c" + GeeHashSet* _tmp34_; + GFile* _tmp35_; #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp34_ = self->priv->unknown_files; #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp35_ = file; #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); -#line 2496 "LibraryMonitor.c" +#line 2515 "LibraryMonitor.c" } } #line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2505,7 +2524,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _g_object_unref0 (representing); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representation); -#line 2509 "LibraryMonitor.c" +#line 2528 "LibraryMonitor.c" } @@ -2515,7 +2534,7 @@ static void library_monitor_real_discovery_completed (DirectoryMonitor* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 323 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_async_discovery_completed (self, NULL, NULL); -#line 2519 "LibraryMonitor.c" +#line 2538 "LibraryMonitor.c" } @@ -2526,34 +2545,58 @@ static void library_monitor_async_discovery_completed_data_free (gpointer _data) _g_object_unref0 (_data_->self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_slice_free (LibraryMonitorAsyncDiscoveryCompletedData, _data_); -#line 2530 "LibraryMonitor.c" +#line 2549 "LibraryMonitor.c" +} + + +static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + LibraryMonitorAsyncDiscoveryCompletedData* _task_data_; +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + if (_task_data_->_callback_ != NULL) { +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 2561 "LibraryMonitor.c" + } +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _task_data_->_task_complete_ = TRUE; +#line 2565 "LibraryMonitor.c" } static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { LibraryMonitorAsyncDiscoveryCompletedData* _data_; - LibraryMonitor* _tmp0_ = NULL; + LibraryMonitor* _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_slice_new0 (LibraryMonitorAsyncDiscoveryCompletedData); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, library_monitor_async_discovery_completed); + _data_->_callback_ = _callback_; +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, library_monitor_async_discovery_completed_async_ready_wrapper, _user_data_); +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, library_monitor_async_discovery_completed_data_free); + _data_->_task_complete_ = TRUE; +#line 2582 "LibraryMonitor.c" + } +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + g_task_set_task_data (_data_->_async_result, _data_, library_monitor_async_discovery_completed_data_free); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _g_object_ref0 (self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_async_discovery_completed_co (_data_); -#line 2549 "LibraryMonitor.c" +#line 2592 "LibraryMonitor.c" } static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_) { LibraryMonitorAsyncDiscoveryCompletedData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2557 "LibraryMonitor.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 2600 "LibraryMonitor.c" } @@ -2562,7 +2605,7 @@ static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpoi result = library_monitor_async_discovery_completed_co (self); #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 2566 "LibraryMonitor.c" +#line 2609 "LibraryMonitor.c" } @@ -2571,113 +2614,86 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn switch (_data_->_state_) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 2575 "LibraryMonitor.c" +#line 2618 "LibraryMonitor.c" goto _state_0; #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 2579 "LibraryMonitor.c" +#line 2622 "LibraryMonitor.c" goto _state_1; default: #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 2584 "LibraryMonitor.c" +#line 2627 "LibraryMonitor.c" } _state_0: #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp0_ = NULL; -#line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp0_ = _data_->self->priv->unknown_files; #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp1_ = 0; -#line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp2_ = 0; -#line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp2_ = _data_->_tmp1_; #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp2_ == 0) { #line 332 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (_data_->self); #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2607 "LibraryMonitor.c" - } else { + if (_data_->_state_ != 0) { +#line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + while (_data_->_task_complete_ != TRUE) { #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 2611 "LibraryMonitor.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 2648 "LibraryMonitor.c" + } } #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_object_unref (_data_->_async_result); #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 2617 "LibraryMonitor.c" +#line 2655 "LibraryMonitor.c" } #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp3_ = NULL; -#line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp3_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->all_candidates = _data_->_tmp3_; #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp4_ = NULL; -#line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->adopted = _data_->_tmp4_; -#line 2631 "LibraryMonitor.c" +#line 2665 "LibraryMonitor.c" { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp5_ = NULL; -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp5_ = _data_->self->priv->unknown_files; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp6_ = NULL; -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp6_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_file_it = _data_->_tmp6_; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp7_ = NULL; -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp7_ = _data_->_file_it; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp8_ = FALSE; -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp8_ = gee_iterator_next (_data_->_tmp7_); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_data_->_tmp8_) { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2657 "LibraryMonitor.c" +#line 2683 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp9_ = NULL; -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp9_ = _data_->_file_it; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10_ = NULL; -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp10_ = gee_iterator_get (_data_->_tmp9_); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->file = (GFile*) _data_->_tmp10_; #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11_ = NULL; -#line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp11_ = _data_->file; #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp12_ = NULL; -#line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp12_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp11_); #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->info = _data_->_tmp12_; #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13_ = NULL; -#line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp13_ = _data_->info; #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp13_ == NULL) { @@ -2687,11 +2703,9 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _g_object_unref0 (_data_->file); #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 2691 "LibraryMonitor.c" +#line 2707 "LibraryMonitor.c" } #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp14_ = NULL; -#line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp14_ = _data_->all_candidates; #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); @@ -2699,29 +2713,19 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _data_->candidates = NULL; #line 348 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->associated = FALSE; -#line 2703 "LibraryMonitor.c" +#line 2717 "LibraryMonitor.c" { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp15_ = NULL; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp15_ = _data_->self->priv->monitors; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = NULL; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp16_ = _g_object_ref0 (_data_->_tmp15_); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_monitor_list = _data_->_tmp16_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp17_ = NULL; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp17_ = _data_->_monitor_list; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp18_ = 0; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19_ = 0; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp19_ = _data_->_tmp18_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_monitor_size = _data_->_tmp19_; @@ -2730,56 +2734,36 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20_ = 0; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp20_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_monitor_index = _data_->_tmp20_ + 1; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp21_ = 0; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp21_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp22_ = 0; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp22_ = _data_->_monitor_size; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!(_data_->_tmp21_ < _data_->_tmp22_)) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2751 "LibraryMonitor.c" +#line 2749 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp23_ = NULL; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp23_ = _data_->_monitor_list; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp24_ = 0; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp24_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp25_ = NULL; -#line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp25_ = gee_list_get (_data_->_tmp23_, _data_->_tmp24_); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->monitor = (MediaMonitor*) _data_->_tmp25_; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp26_ = NULL; -#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp26_ = _data_->monitor; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = NULL; -#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp27_ = _data_->file; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp28_ = NULL; -#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp28_ = _data_->info; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp29_ = 0; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp30_ = NULL; -#line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp30_ = media_monitor_candidates_for_unknown_file (_data_->_tmp26_, _data_->_tmp27_, _data_->_tmp28_, &_data_->_tmp29_); #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_result_ = _data_->_tmp29_; @@ -2788,22 +2772,18 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->candidates = _data_->_tmp30_; #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp32_ = 0; -#line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp32_ = _data_->_result_; #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp31_ = TRUE; -#line 2799 "LibraryMonitor.c" +#line 2781 "LibraryMonitor.c" } else { #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = 0; -#line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp33_ = _data_->_result_; #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp31_ = _data_->_tmp33_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 2807 "LibraryMonitor.c" +#line 2787 "LibraryMonitor.c" } #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp31_) { @@ -2813,48 +2793,36 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _g_object_unref0 (_data_->monitor); #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2817 "LibraryMonitor.c" +#line 2797 "LibraryMonitor.c" } else { #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp34_ = NULL; -#line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp34_ = _data_->candidates; #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp34_ != NULL) { #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp35_ = NULL; -#line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp35_ = _data_->all_candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp36_ = NULL; -#line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp36_ = _data_->candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_array_list_add_all (_data_->_tmp35_, _data_->_tmp36_); -#line 2835 "LibraryMonitor.c" +#line 2809 "LibraryMonitor.c" } } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); -#line 2840 "LibraryMonitor.c" +#line 2814 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_monitor_list); -#line 2844 "LibraryMonitor.c" +#line 2818 "LibraryMonitor.c" } #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp37_ = FALSE; -#line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp37_ = _data_->associated; #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp37_) { #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp38_ = NULL; -#line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp38_ = _data_->adopted; #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp39_ = NULL; -#line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp39_ = _data_->file; #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _data_->_tmp39_); @@ -2866,65 +2834,41 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _g_object_unref0 (_data_->file); #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 2870 "LibraryMonitor.c" +#line 2838 "LibraryMonitor.c" } #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp40_ = NULL; -#line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp40_ = _data_->all_candidates; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp41_ = 0; -#line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp42_ = 0; -#line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp42_ = _data_->_tmp41_; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp42_ > 0) { #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp43_ = NULL; -#line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp43_ = _data_->all_candidates; #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp44_ = NULL; -#line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp44_ = _g_object_ref0 (_data_->_tmp43_); #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->job_candidates = _data_->_tmp44_; #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp45_ = NULL; -#line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp45_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->all_candidates); #line 372 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->all_candidates = _data_->_tmp45_; #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp46_ = 0; -#line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp46_ = _data_->self->priv->checksums_total; #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self->priv->checksums_total = _data_->_tmp46_ + 1; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp47_ = NULL; -#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp47_ = _data_->self->priv->workers; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp48_ = NULL; -#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp48_ = _data_->file; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp49_ = NULL; -#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp49_ = _data_->job_candidates; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp50_ = NULL; -#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp50_ = library_monitor_find_move_job_new (_data_->self, _data_->_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp49_, GEE_TYPE_COLLECTION, GeeCollection)); #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp51_ = NULL; -#line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp51_ = _data_->_tmp50_; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" workers_enqueue (_data_->_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp51_, TYPE_BACKGROUND_JOB, BackgroundJob)); @@ -2932,7 +2876,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _background_job_unref0 (_data_->_tmp51_); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->job_candidates); -#line 2936 "LibraryMonitor.c" +#line 2880 "LibraryMonitor.c" } #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _library_monitor_async_discovery_completed_co_gsource_func, _data_, NULL); @@ -2940,7 +2884,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _data_->_state_ = 1; #line 379 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 2944 "LibraryMonitor.c" +#line 2888 "LibraryMonitor.c" _state_1: ; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2949,92 +2893,77 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _g_object_unref0 (_data_->info); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); -#line 2953 "LibraryMonitor.c" +#line 2897 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_file_it); -#line 2957 "LibraryMonitor.c" +#line 2901 "LibraryMonitor.c" } #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp52_ = NULL; -#line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp52_ = _data_->self->priv->unknown_files; #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp53_ = NULL; -#line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp53_ = _data_->adopted; #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp53_, GEE_TYPE_COLLECTION, GeeCollection)); #line 385 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self->priv->checksums_completed = 0; #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp54_ = 0; -#line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp54_ = _data_->self->priv->checksums_total; #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp54_ == 0) { #line 388 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (_data_->self); -#line 2979 "LibraryMonitor.c" +#line 2917 "LibraryMonitor.c" } else { #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp55_ = 0; -#line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp55_ = _data_->self->priv->checksums_total; #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp56_ = NULL; -#line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp56_ = g_strdup_printf ("%d checksum jobs initiated to verify unknown photo files", _data_->_tmp55_); #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp57_ = NULL; -#line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp57_ = _data_->_tmp56_; #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" directory_monitor_mdbg (_data_->_tmp57_); #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_data_->_tmp57_); #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp58_ = 0; -#line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp58_ = _data_->self->priv->checksums_completed; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp59_ = 0; -#line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp59_ = _data_->self->priv->checksums_total; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (_data_->self, "auto-update-progress", _data_->_tmp58_, _data_->_tmp59_); -#line 3007 "LibraryMonitor.c" + g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp58_, _data_->_tmp59_); +#line 2935 "LibraryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->adopted); #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->all_candidates); #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3017 "LibraryMonitor.c" - } else { + if (_data_->_state_ != 0) { +#line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + while (_data_->_task_complete_ != TRUE) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3021 "LibraryMonitor.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 2949 "LibraryMonitor.c" + } } #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_object_unref (_data_->_async_result); #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 3027 "LibraryMonitor.c" +#line 2956 "LibraryMonitor.c" } static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 395 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 396 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3052,7 +2981,7 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) #line 399 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->checksums_total; #line 399 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (self, "auto-update-progress", _tmp3_, _tmp4_); + g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _tmp3_, _tmp4_); #line 401 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->checksums_completed; #line 401 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3061,7 +2990,7 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) if (_tmp5_ == _tmp6_) { #line 402 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (self); -#line 3065 "LibraryMonitor.c" +#line 2994 "LibraryMonitor.c" } } @@ -3069,18 +2998,18 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) static gpointer _background_job_ref0 (gpointer self) { #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? background_job_ref (self) : NULL; -#line 3073 "LibraryMonitor.c" +#line 3002 "LibraryMonitor.c" } static void library_monitor_on_find_move_completed (LibraryMonitor* self, BackgroundJob* j) { LibraryMonitorFindMoveJob* job = NULL; - BackgroundJob* _tmp0_ = NULL; - LibraryMonitorFindMoveJob* _tmp1_ = NULL; - LibraryMonitorFindMoveJob* _tmp2_ = NULL; - Monitorable* _tmp3_ = NULL; - LibraryMonitorFindMoveJob* _tmp28_ = NULL; - GError* _tmp29_ = NULL; + BackgroundJob* _tmp0_; + LibraryMonitorFindMoveJob* _tmp1_; + LibraryMonitorFindMoveJob* _tmp2_; + Monitorable* _tmp3_; + LibraryMonitorFindMoveJob* _tmp28_; + GError* _tmp29_; #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3097,32 +3026,32 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr _tmp3_ = _tmp2_->match; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp3_ != NULL) { -#line 3101 "LibraryMonitor.c" - LibraryMonitorFindMoveJob* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - LibraryMonitorFindMoveJob* _tmp8_ = NULL; - Monitorable* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 3030 "LibraryMonitor.c" + LibraryMonitorFindMoveJob* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + LibraryMonitorFindMoveJob* _tmp8_; + Monitorable* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; MediaMonitor* monitor = NULL; - LibraryMonitorFindMoveJob* _tmp14_ = NULL; - Monitorable* _tmp15_ = NULL; - MediaMonitor* _tmp16_ = NULL; - MediaMonitor* _tmp17_ = NULL; - LibraryMonitorFindMoveJob* _tmp18_ = NULL; - Monitorable* _tmp19_ = NULL; - LibraryMonitorFindMoveJob* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - GeeHashSet* _tmp22_ = NULL; - LibraryMonitorFindMoveJob* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; - MediaMonitor* _tmp25_ = NULL; - LibraryMonitorFindMoveJob* _tmp26_ = NULL; - Monitorable* _tmp27_ = NULL; + LibraryMonitorFindMoveJob* _tmp14_; + Monitorable* _tmp15_; + MediaMonitor* _tmp16_; + MediaMonitor* _tmp17_; + LibraryMonitorFindMoveJob* _tmp18_; + Monitorable* _tmp19_; + LibraryMonitorFindMoveJob* _tmp20_; + GFile* _tmp21_; + GeeHashSet* _tmp22_; + LibraryMonitorFindMoveJob* _tmp23_; + GFile* _tmp24_; + MediaMonitor* _tmp25_; + LibraryMonitorFindMoveJob* _tmp26_; + Monitorable* _tmp27_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = job; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3189,7 +3118,7 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr library_monitor_add_to_discovered_list (self, _tmp25_, _tmp27_); #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 3193 "LibraryMonitor.c" +#line 3122 "LibraryMonitor.c" } #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = job; @@ -3197,14 +3126,14 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr _tmp29_ = _tmp28_->err; #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp29_ != NULL) { -#line 3201 "LibraryMonitor.c" - LibraryMonitorFindMoveJob* _tmp30_ = NULL; - GFile* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - LibraryMonitorFindMoveJob* _tmp34_ = NULL; - GError* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; +#line 3130 "LibraryMonitor.c" + LibraryMonitorFindMoveJob* _tmp30_; + GFile* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + LibraryMonitorFindMoveJob* _tmp34_; + GError* _tmp35_; + const gchar* _tmp36_; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp30_ = job; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3223,13 +3152,13 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp33_, _tmp36_); #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp33_); -#line 3227 "LibraryMonitor.c" +#line 3156 "LibraryMonitor.c" } #line 424 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_report_checksum_job_completed (self); #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 3233 "LibraryMonitor.c" +#line 3162 "LibraryMonitor.c" } @@ -3240,25 +3169,25 @@ static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, Backgr g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 428 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_report_checksum_job_completed (self); -#line 3244 "LibraryMonitor.c" +#line 3173 "LibraryMonitor.c" } static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { - gboolean _tmp65_ = FALSE; - TombstoneSourceCollection* _tmp67_ = NULL; - GCancellable* _tmp68_ = NULL; + gboolean _tmp65_; + TombstoneSourceCollection* _tmp67_; + GCancellable* _tmp68_; #line 431 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); -#line 3254 "LibraryMonitor.c" +#line 3183 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->monitors; @@ -3278,19 +3207,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitor_index = -1; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3282 "LibraryMonitor.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; +#line 3211 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp8_ = NULL; - gint _tmp9_ = 0; - gpointer _tmp10_ = NULL; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; GeeSet* monitorables = NULL; - GeeHashMap* _tmp11_ = NULL; - MediaMonitor* _tmp12_ = NULL; - gpointer _tmp13_ = NULL; - GeeSet* _tmp14_ = NULL; + GeeHashMap* _tmp11_; + MediaMonitor* _tmp12_; + gpointer _tmp13_; + GeeSet* _tmp14_; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3303,7 +3232,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!(_tmp6_ < _tmp7_)) { #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3307 "LibraryMonitor.c" +#line 3236 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -3325,11 +3254,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp14_ = monitorables; #line 434 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp14_ != NULL) { -#line 3329 "LibraryMonitor.c" +#line 3258 "LibraryMonitor.c" { GeeIterator* _monitorable_it = NULL; - GeeSet* _tmp15_ = NULL; - GeeIterator* _tmp16_ = NULL; + GeeSet* _tmp15_; + GeeIterator* _tmp16_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp15_ = monitorables; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3338,14 +3267,14 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitorable_it = _tmp16_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3342 "LibraryMonitor.c" - GeeIterator* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; +#line 3271 "LibraryMonitor.c" + GeeIterator* _tmp17_; + gboolean _tmp18_; Monitorable* monitorable = NULL; - GeeIterator* _tmp19_ = NULL; - gpointer _tmp20_ = NULL; - Monitorable* _tmp21_ = NULL; - MediaMonitor* _tmp22_ = NULL; + GeeIterator* _tmp19_; + gpointer _tmp20_; + Monitorable* _tmp21_; + MediaMonitor* _tmp22_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = _monitorable_it; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3354,7 +3283,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!_tmp18_) { #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3358 "LibraryMonitor.c" +#line 3287 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = _monitorable_it; @@ -3370,22 +3299,22 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { library_monitor_enqueue_verify_monitorable (self, _tmp21_, _tmp22_); #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); -#line 3374 "LibraryMonitor.c" +#line 3303 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 3378 "LibraryMonitor.c" +#line 3307 "LibraryMonitor.c" } } { GeeIterator* _object_it = NULL; - MediaMonitor* _tmp23_ = NULL; - MediaSourceCollection* _tmp24_ = NULL; - MediaSourceCollection* _tmp25_ = NULL; - GeeCollection* _tmp26_ = NULL; - GeeCollection* _tmp27_ = NULL; - GeeIterator* _tmp28_ = NULL; - GeeIterator* _tmp29_ = NULL; + MediaMonitor* _tmp23_; + MediaSourceCollection* _tmp24_; + MediaSourceCollection* _tmp25_; + GeeCollection* _tmp26_; + GeeCollection* _tmp27_; + GeeIterator* _tmp28_; + GeeIterator* _tmp29_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp23_ = monitor; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3408,19 +3337,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _object_it = _tmp29_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3412 "LibraryMonitor.c" - GeeIterator* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; +#line 3341 "LibraryMonitor.c" + GeeIterator* _tmp30_; + gboolean _tmp31_; DataObject* object = NULL; - GeeIterator* _tmp32_ = NULL; - gpointer _tmp33_ = NULL; + GeeIterator* _tmp32_; + gpointer _tmp33_; Monitorable* monitorable = NULL; - DataObject* _tmp34_ = NULL; - Monitorable* _tmp35_ = NULL; + DataObject* _tmp34_; + Monitorable* _tmp35_; gboolean _tmp36_ = FALSE; - GeeSet* _tmp37_ = NULL; - Monitorable* _tmp41_ = NULL; - MediaMonitor* _tmp42_ = NULL; + GeeSet* _tmp37_; + Monitorable* _tmp41_; + MediaMonitor* _tmp42_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp30_ = _object_it; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3429,7 +3358,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!_tmp31_) { #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3433 "LibraryMonitor.c" +#line 3362 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp32_ = _object_it; @@ -3447,10 +3376,10 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp37_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp37_ != NULL) { -#line 3451 "LibraryMonitor.c" - GeeSet* _tmp38_ = NULL; - Monitorable* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; +#line 3380 "LibraryMonitor.c" + GeeSet* _tmp38_; + Monitorable* _tmp39_; + gboolean _tmp40_; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp38_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3459,11 +3388,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp40_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_); #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = _tmp40_; -#line 3463 "LibraryMonitor.c" +#line 3392 "LibraryMonitor.c" } else { #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = FALSE; -#line 3467 "LibraryMonitor.c" +#line 3396 "LibraryMonitor.c" } #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp36_) { @@ -3473,7 +3402,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _g_object_unref0 (object); #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 3477 "LibraryMonitor.c" +#line 3406 "LibraryMonitor.c" } #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp41_ = monitorable; @@ -3485,23 +3414,23 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _g_object_unref0 (monitorable); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (object); -#line 3489 "LibraryMonitor.c" +#line 3418 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_object_it); -#line 3493 "LibraryMonitor.c" +#line 3422 "LibraryMonitor.c" } { GeeIterator* _source_it = NULL; - MediaMonitor* _tmp43_ = NULL; - MediaSourceCollection* _tmp44_ = NULL; - MediaSourceCollection* _tmp45_ = NULL; - MediaSourceHoldingTank* _tmp46_ = NULL; - MediaSourceHoldingTank* _tmp47_ = NULL; - GeeCollection* _tmp48_ = NULL; - GeeCollection* _tmp49_ = NULL; - GeeIterator* _tmp50_ = NULL; - GeeIterator* _tmp51_ = NULL; + MediaMonitor* _tmp43_; + MediaSourceCollection* _tmp44_; + MediaSourceCollection* _tmp45_; + MediaSourceHoldingTank* _tmp46_; + MediaSourceHoldingTank* _tmp47_; + GeeCollection* _tmp48_; + GeeCollection* _tmp49_; + GeeIterator* _tmp50_; + GeeIterator* _tmp51_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp43_ = monitor; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3530,19 +3459,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _source_it = _tmp51_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3534 "LibraryMonitor.c" - GeeIterator* _tmp52_ = NULL; - gboolean _tmp53_ = FALSE; +#line 3463 "LibraryMonitor.c" + GeeIterator* _tmp52_; + gboolean _tmp53_; DataSource* source = NULL; - GeeIterator* _tmp54_ = NULL; - gpointer _tmp55_ = NULL; + GeeIterator* _tmp54_; + gpointer _tmp55_; Monitorable* monitorable = NULL; - DataSource* _tmp56_ = NULL; - Monitorable* _tmp57_ = NULL; + DataSource* _tmp56_; + Monitorable* _tmp57_; gboolean _tmp58_ = FALSE; - GeeSet* _tmp59_ = NULL; - Monitorable* _tmp63_ = NULL; - MediaMonitor* _tmp64_ = NULL; + GeeSet* _tmp59_; + Monitorable* _tmp63_; + MediaMonitor* _tmp64_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp52_ = _source_it; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3551,7 +3480,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!_tmp53_) { #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3555 "LibraryMonitor.c" +#line 3484 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp54_ = _source_it; @@ -3569,10 +3498,10 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp59_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp59_ != NULL) { -#line 3573 "LibraryMonitor.c" - GeeSet* _tmp60_ = NULL; - Monitorable* _tmp61_ = NULL; - gboolean _tmp62_ = FALSE; +#line 3502 "LibraryMonitor.c" + GeeSet* _tmp60_; + Monitorable* _tmp61_; + gboolean _tmp62_; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp60_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3581,11 +3510,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp62_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), _tmp61_); #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp58_ = _tmp62_; -#line 3585 "LibraryMonitor.c" +#line 3514 "LibraryMonitor.c" } else { #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp58_ = FALSE; -#line 3589 "LibraryMonitor.c" +#line 3518 "LibraryMonitor.c" } #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp58_) { @@ -3595,7 +3524,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _g_object_unref0 (source); #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 3599 "LibraryMonitor.c" +#line 3528 "LibraryMonitor.c" } #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp63_ = monitorable; @@ -3607,33 +3536,33 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _g_object_unref0 (monitorable); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (source); -#line 3611 "LibraryMonitor.c" +#line 3540 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_source_it); -#line 3615 "LibraryMonitor.c" +#line 3544 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorables); #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 3621 "LibraryMonitor.c" +#line 3550 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 3625 "LibraryMonitor.c" +#line 3554 "LibraryMonitor.c" } #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp65_ = self->priv->auto_import; #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp65_) { -#line 3631 "LibraryMonitor.c" - GeeHashSet* _tmp66_ = NULL; +#line 3560 "LibraryMonitor.c" + GeeHashSet* _tmp66_; #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp66_ = self->priv->unknown_files; #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 3637 "LibraryMonitor.c" +#line 3566 "LibraryMonitor.c" } #line 464 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); @@ -3651,19 +3580,19 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { tombstone_source_collection_launch_scan (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp68_); #line 472 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 3655 "LibraryMonitor.c" +#line 3584 "LibraryMonitor.c" } static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor) { gboolean offered = FALSE; - GeeQueue* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; - MediaMonitor* _tmp2_ = NULL; - LibraryMonitorVerifyJob* _tmp3_ = NULL; - LibraryMonitorVerifyJob* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; + GeeQueue* _tmp0_; + Monitorable* _tmp1_; + MediaMonitor* _tmp2_; + LibraryMonitorVerifyJob* _tmp3_; + LibraryMonitorVerifyJob* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; #line 475 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 475 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3692,22 +3621,22 @@ static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Mo _vala_assert (offered, "offered"); #line 479 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_execute_next_verify_job (self); -#line 3696 "LibraryMonitor.c" +#line 3625 "LibraryMonitor.c" } static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; + gint _tmp1_; LibraryMonitorVerifyJob* job = NULL; - GeeQueue* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - LibraryMonitorVerifyJob* _tmp7_ = NULL; - gint _tmp8_ = 0; - LibraryMonitorVerifyJob* _tmp9_ = NULL; - Monitorable* _tmp10_ = NULL; - LibraryMonitorVerifyJob* _tmp11_ = NULL; - MediaMonitor* _tmp12_ = NULL; + GeeQueue* _tmp5_; + gpointer _tmp6_; + LibraryMonitorVerifyJob* _tmp7_; + gint _tmp8_; + LibraryMonitorVerifyJob* _tmp9_; + Monitorable* _tmp10_; + LibraryMonitorVerifyJob* _tmp11_; + MediaMonitor* _tmp12_; #line 482 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3716,11 +3645,11 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { if (_tmp1_ >= LIBRARY_MONITOR_MAX_VERIFY_EXISTING_MEDIA_JOBS) { #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 3720 "LibraryMonitor.c" +#line 3649 "LibraryMonitor.c" } else { - GeeQueue* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeQueue* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->verify_queue; #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3729,13 +3658,13 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { _tmp4_ = _tmp3_; #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_ == 0; -#line 3733 "LibraryMonitor.c" +#line 3662 "LibraryMonitor.c" } #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 484 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 3739 "LibraryMonitor.c" +#line 3668 "LibraryMonitor.c" } #line 486 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->verify_queue; @@ -3763,7 +3692,7 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { library_monitor_verify_monitorable (self, _tmp10_, _tmp12_, NULL, NULL); #line 482 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _library_monitor_verify_job_unref0 (job); -#line 3767 "LibraryMonitor.c" +#line 3696 "LibraryMonitor.c" } @@ -3778,23 +3707,47 @@ static void library_monitor_verify_monitorable_data_free (gpointer _data) { _g_object_unref0 (_data_->self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_slice_free (LibraryMonitorVerifyMonitorableData, _data_); -#line 3782 "LibraryMonitor.c" +#line 3711 "LibraryMonitor.c" +} + + +static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + LibraryMonitorVerifyMonitorableData* _task_data_; +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + if (_task_data_->_callback_ != NULL) { +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 3723 "LibraryMonitor.c" + } +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _task_data_->_task_complete_ = TRUE; +#line 3727 "LibraryMonitor.c" } static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_) { LibraryMonitorVerifyMonitorableData* _data_; - LibraryMonitor* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; - Monitorable* _tmp2_ = NULL; - MediaMonitor* _tmp3_ = NULL; - MediaMonitor* _tmp4_ = NULL; + LibraryMonitor* _tmp0_; + Monitorable* _tmp1_; + Monitorable* _tmp2_; + MediaMonitor* _tmp3_; + MediaMonitor* _tmp4_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_slice_new0 (LibraryMonitorVerifyMonitorableData); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, library_monitor_verify_monitorable); + _data_->_callback_ = _callback_; +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, library_monitor_verify_monitorable_async_ready_wrapper, _user_data_); +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + if (_callback_ == NULL) { +#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 3748 "LibraryMonitor.c" + } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free); + g_task_set_task_data (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _g_object_ref0 (self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3817,32 +3770,32 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl _data_->monitor = _tmp4_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3821 "LibraryMonitor.c" +#line 3774 "LibraryMonitor.c" } static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_) { LibraryMonitorVerifyMonitorableData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 3829 "LibraryMonitor.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 3782 "LibraryMonitor.c" } -static void _vala_array_add130 (GFile*** array, int* length, int* size, GFile* value) { +static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value) { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if ((*length) == (*size)) { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 3840 "LibraryMonitor.c" +#line 3793 "LibraryMonitor.c" } #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" (*array)[(*length)++] = value; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" (*array)[*length] = NULL; -#line 3846 "LibraryMonitor.c" +#line 3799 "LibraryMonitor.c" } @@ -3855,8 +3808,10 @@ static void library_monitor_verify_monitorable_ready (GObject* source_object, GA #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_res_ = _res_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3860 "LibraryMonitor.c" +#line 3815 "LibraryMonitor.c" } @@ -3865,7 +3820,7 @@ static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer se result = library_monitor_verify_monitorable_co (self); #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 3869 "LibraryMonitor.c" +#line 3824 "LibraryMonitor.c" } @@ -3874,107 +3829,69 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit switch (_data_->_state_) { #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 3878 "LibraryMonitor.c" +#line 3833 "LibraryMonitor.c" goto _state_0; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 3882 "LibraryMonitor.c" +#line 3837 "LibraryMonitor.c" goto _state_1; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 2: -#line 3886 "LibraryMonitor.c" +#line 3841 "LibraryMonitor.c" goto _state_2; default: #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 3891 "LibraryMonitor.c" +#line 3846 "LibraryMonitor.c" } _state_0: #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp0_ = NULL; -#line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp0_ = g_new0 (GFile*, 1 + 1); #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->files_length1 = 0; -#line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_files_size_ = 0; -#line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->files = _data_->_tmp0_; #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->files_length1 = 1; #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_files_size_ = _data_->files_length1; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp1_ = NULL; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp1__length1 = 0; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp1_ = _data_->files; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp1__length1 = _data_->files_length1; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp2_ = NULL; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp2_ = _data_->monitor; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp3_ = NULL; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp3_ = _data_->monitorable; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp4_ = NULL; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp4_ = media_monitor_get_master_file (_data_->_tmp2_, _data_->_tmp3_); #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_tmp1_[0]); #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp1_[0] = _data_->_tmp4_; #line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp5_ = NULL; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp5_ = _data_->_tmp1_[0]; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp6_ = NULL; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp6_ = _data_->monitor; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp7_ = NULL; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp7_ = _data_->monitorable; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp8_ = 0; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp9_ = NULL; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp9_ = media_monitor_get_auxilliary_backing_files (_data_->_tmp6_, _data_->_tmp7_, &_data_->_tmp8_); #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_files_length1 = 0; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_aux_files_size_ = 0; -#line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_files = _data_->_tmp9_; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_files_length1 = _data_->_tmp8_; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_aux_files_size_ = _data_->aux_files_length1; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10_ = NULL; -#line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10__length1 = 0; -#line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp10_ = _data_->aux_files; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp10__length1 = _data_->aux_files_length1; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp10_ != NULL) { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11_ = NULL; -#line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11__length1 = 0; -#line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp11_ = _data_->aux_files; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp11__length1 = _data_->aux_files_length1; -#line 3978 "LibraryMonitor.c" +#line 3895 "LibraryMonitor.c" { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_file_collection_length1 = 0; @@ -3987,34 +3904,24 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" for (_data_->aux_file_it = 0; _data_->aux_file_it < _data_->_tmp11__length1; _data_->aux_file_it = _data_->aux_file_it + 1) { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp12_ = NULL; -#line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp12_ = _g_object_ref0 (_data_->aux_file_collection[_data_->aux_file_it]); #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_file = _data_->_tmp12_; -#line 3996 "LibraryMonitor.c" +#line 3911 "LibraryMonitor.c" { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13_ = NULL; -#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13__length1 = 0; -#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp13_ = _data_->files; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp13__length1 = _data_->files_length1; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp14_ = NULL; -#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp14_ = _data_->aux_file; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp15_ = NULL; -#line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_); #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _vala_array_add130 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_); #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->aux_file); -#line 4018 "LibraryMonitor.c" +#line 3925 "LibraryMonitor.c" } } } @@ -4022,7 +3929,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->ctr = 0; -#line 4026 "LibraryMonitor.c" +#line 3933 "LibraryMonitor.c" { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp16_ = TRUE; @@ -4031,24 +3938,16 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_data_->_tmp16_) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp17_ = 0; -#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp17_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->ctr = _data_->_tmp17_ + 1; -#line 4040 "LibraryMonitor.c" +#line 3945 "LibraryMonitor.c" } #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp16_ = FALSE; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp18_ = 0; -#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp18_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19_ = NULL; -#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19__length1 = 0; -#line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp19_ = _data_->files; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp19__length1 = _data_->files_length1; @@ -4056,55 +3955,35 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit if (!(_data_->_tmp18_ < _data_->_tmp19__length1)) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4060 "LibraryMonitor.c" +#line 3959 "LibraryMonitor.c" } #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20_ = NULL; -#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20__length1 = 0; -#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp20_ = _data_->files; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp20__length1 = _data_->files_length1; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp21_ = 0; -#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp21_ = _data_->ctr; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp22_ = NULL; -#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp22_ = _data_->_tmp20_[_data_->_tmp21_]; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp23_ = NULL; -#line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp23_ = _g_object_ref0 (_data_->_tmp22_); #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->file = _data_->_tmp23_; #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp24_ = NULL; -#line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp24_ = _data_->file; #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp25_ = NULL; -#line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp25_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp24_); #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->info = _data_->_tmp25_; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp26_ = NULL; -#line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp26_ = _data_->info; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp26_ == NULL) { -#line 4100 "LibraryMonitor.c" +#line 3983 "LibraryMonitor.c" { #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp28_ = NULL; -#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp28_ = _data_->file; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp29_ = NULL; -#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp29_ = _data_->self->priv->cancellable; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_state_ = 1; @@ -4112,22 +3991,18 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit g_file_query_info_async (_data_->_tmp28_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_FILE_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp29_, library_monitor_verify_monitorable_ready, _data_); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4116 "LibraryMonitor.c" +#line 3995 "LibraryMonitor.c" _state_1: #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp30_ = NULL; -#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp30_ = g_file_query_info_finish (_data_->_tmp28_, _data_->_res_, &_data_->_inner_error_); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp27_ = _data_->_tmp30_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 4126 "LibraryMonitor.c" - goto __catch485_g_error; +#line 4003 "LibraryMonitor.c" + goto __catch486_g_error; } #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = NULL; -#line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp31_ = _data_->_tmp27_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp27_ = NULL; @@ -4137,10 +4012,10 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->info = _data_->_tmp31_; #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_tmp27_); -#line 4141 "LibraryMonitor.c" +#line 4016 "LibraryMonitor.c" } - goto __finally485; - __catch485_g_error: + goto __finally486; + __catch486_g_error: { #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->err = _data_->_inner_error_; @@ -4148,9 +4023,9 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_inner_error_ = NULL; #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (_data_->err); -#line 4152 "LibraryMonitor.c" +#line 4027 "LibraryMonitor.c" } - __finally485: + __finally486: #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4166,113 +4041,81 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_clear_error (&_data_->_inner_error_); #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + g_object_unref (_data_->_async_result); +#line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4171 "LibraryMonitor.c" +#line 4048 "LibraryMonitor.c" } } #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp32_ = 0; -#line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp32_ = _data_->ctr; #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp32_ == 0) { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp34_ = NULL; -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp34_ = _data_->info; #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp34_ != NULL) { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp35_ = NULL; -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp35_ = _data_->monitor; #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp36_ = NULL; -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp36_ = _data_->monitorable; #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp37_ = FALSE; -#line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp37_ = media_monitor_is_offline (_data_->_tmp35_, _data_->_tmp36_); #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp33_ = _data_->_tmp37_; -#line 4200 "LibraryMonitor.c" +#line 4067 "LibraryMonitor.c" } else { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp33_ = FALSE; -#line 4204 "LibraryMonitor.c" +#line 4071 "LibraryMonitor.c" } #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp33_) { #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp38_ = NULL; -#line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp38_ = _data_->monitor; #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp39_ = NULL; -#line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp39_ = _data_->monitorable; #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" media_monitor_update_online (_data_->_tmp38_, _data_->_tmp39_); -#line 4218 "LibraryMonitor.c" +#line 4081 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp41_ = NULL; -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp41_ = _data_->info; #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp41_ == NULL) { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp42_ = NULL; -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp42_ = _data_->monitor; #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp43_ = NULL; -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp43_ = _data_->monitorable; #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp44_ = FALSE; -#line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp44_ = media_monitor_is_offline (_data_->_tmp42_, _data_->_tmp43_); #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp40_ = !_data_->_tmp44_; -#line 4240 "LibraryMonitor.c" +#line 4095 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp40_ = FALSE; -#line 4244 "LibraryMonitor.c" +#line 4099 "LibraryMonitor.c" } #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp40_) { #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp45_ = NULL; -#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp45_ = _data_->monitor; #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp46_ = NULL; -#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp46_ = _data_->monitorable; #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" media_monitor_update_offline (_data_->_tmp45_, _data_->_tmp46_); -#line 4258 "LibraryMonitor.c" +#line 4109 "LibraryMonitor.c" } } } #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp47_ = NULL; -#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp47_ = _data_->monitor; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp48_ = NULL; -#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp48_ = _data_->monitorable; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp49_ = NULL; -#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp49_ = _data_->file; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp50_ = NULL; -#line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp50_ = _data_->info; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" media_monitor_update_backing_file_info (_data_->_tmp47_, _data_->_tmp48_, _data_->_tmp49_, _data_->_tmp50_); @@ -4280,44 +4123,34 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _g_object_unref0 (_data_->info); #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); -#line 4284 "LibraryMonitor.c" +#line 4127 "LibraryMonitor.c" } } } #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp51_ = 0; -#line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp51_ = _data_->self->priv->completed_monitorable_verifies; #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self->priv->completed_monitorable_verifies = _data_->_tmp51_ + 1; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp52_ = 0; -#line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp52_ = _data_->self->priv->completed_monitorable_verifies; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp53_ = 0; -#line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp53_ = _data_->self->priv->total_monitorable_verifies; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (_data_->self, "auto-update-progress", _data_->_tmp52_, _data_->_tmp53_); + g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp52_, _data_->_tmp53_); #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _library_monitor_verify_monitorable_co_gsource_func, _data_, NULL); #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_state_ = 2; #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4310 "LibraryMonitor.c" +#line 4147 "LibraryMonitor.c" _state_2: ; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp54_ = 0; -#line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp54_ = _data_->self->priv->outstanding_verify_jobs; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _vala_assert (_data_->_tmp54_ > 0, "outstanding_verify_jobs > 0"); #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp55_ = 0; -#line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp55_ = _data_->self->priv->outstanding_verify_jobs; #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self->priv->outstanding_verify_jobs = _data_->_tmp55_ - 1; @@ -4328,33 +4161,34 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->files = (_vala_array_free (_data_->files, _data_->files_length1, (GDestroyNotify) g_object_unref), NULL); #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4335 "LibraryMonitor.c" - } else { + if (_data_->_state_ != 0) { #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 4339 "LibraryMonitor.c" + while (_data_->_task_complete_ != TRUE) { +#line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 4172 "LibraryMonitor.c" + } } #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_object_unref (_data_->_async_result); #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4345 "LibraryMonitor.c" +#line 4179 "LibraryMonitor.c" } static void library_monitor_on_config_changed (LibraryMonitor* 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 540 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4377,7 +4211,7 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { if (_tmp4_ == _tmp5_) { #line 544 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4381 "LibraryMonitor.c" +#line 4215 "LibraryMonitor.c" } #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = value; @@ -4387,20 +4221,20 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { _tmp7_ = self->priv->auto_import; #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp7_) { -#line 4391 "LibraryMonitor.c" - gboolean _tmp8_ = FALSE; +#line 4225 "LibraryMonitor.c" + gboolean _tmp8_; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = commandline_options_no_runtime_monitoring; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp8_) { #line 549 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_import_unrepresented_files (self); -#line 4399 "LibraryMonitor.c" +#line 4233 "LibraryMonitor.c" } } else { #line 551 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_cancel_batch_imports (self); -#line 4404 "LibraryMonitor.c" +#line 4238 "LibraryMonitor.c" } } @@ -4408,9 +4242,9 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GeeHashSet* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeHashSet* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; #line 555 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 555 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4423,50 +4257,50 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { _tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp4_) { -#line 4427 "LibraryMonitor.c" - GFile* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 4261 "LibraryMonitor.c" + GFile* _tmp5_; + gboolean _tmp6_; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = file; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = library_monitor_is_supported_filetype (self, _tmp5_); #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp6_; -#line 4436 "LibraryMonitor.c" +#line 4270 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 4440 "LibraryMonitor.c" +#line 4274 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 4444 "LibraryMonitor.c" - GFile* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 4278 "LibraryMonitor.c" + GFile* _tmp7_; + gboolean _tmp8_; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = file; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = library_monitor_is_blacklisted (_tmp7_); #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = !_tmp8_; -#line 4453 "LibraryMonitor.c" +#line 4287 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 4457 "LibraryMonitor.c" +#line 4291 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 4461 "LibraryMonitor.c" - GeeHashSet* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; +#line 4295 "LibraryMonitor.c" + GeeHashSet* _tmp9_; + GFile* _tmp10_; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = self->priv->import_queue; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = file; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 4470 "LibraryMonitor.c" +#line 4304 "LibraryMonitor.c" } } @@ -4476,11 +4310,11 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 560 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); -#line 4480 "LibraryMonitor.c" +#line 4314 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = files; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4489,13 +4323,13 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec _file_it = _tmp1_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4493 "LibraryMonitor.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 4327 "LibraryMonitor.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; GFile* file = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + GFile* _tmp6_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = _file_it; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4504,7 +4338,7 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec if (!_tmp3_) { #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4508 "LibraryMonitor.c" +#line 4342 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = _file_it; @@ -4518,18 +4352,18 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec library_monitor_enqueue_import (self, _tmp6_); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 4522 "LibraryMonitor.c" +#line 4356 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4526 "LibraryMonitor.c" +#line 4360 "LibraryMonitor.c" } } static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* file) { - GeeHashSet* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + GFile* _tmp1_; #line 565 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 565 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4540,39 +4374,39 @@ static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* f _tmp1_ = file; #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 4544 "LibraryMonitor.c" +#line 4378 "LibraryMonitor.c" } static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { gboolean result = FALSE; - GCancellable* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GeeHashSet* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - BatchImport* _tmp5_ = NULL; - GeeHashSet* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + GCancellable* _tmp0_; + gboolean _tmp1_; + GeeHashSet* _tmp2_; + gint _tmp3_; + gint _tmp4_; + BatchImport* _tmp5_; + GeeHashSet* _tmp6_; + gint _tmp7_; + gint _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; time_t now = 0; - gulong _tmp11_ = 0UL; + gulong _tmp11_; gboolean _tmp12_ = FALSE; - BatchImportRoll* _tmp13_ = NULL; - time_t _tmp17_ = 0; + BatchImportRoll* _tmp13_; + time_t _tmp17_; GeeArrayList* jobs = NULL; - GeeArrayList* _tmp18_ = NULL; - GeeHashSet* _tmp33_ = NULL; + GeeArrayList* _tmp18_; + GeeHashSet* _tmp33_; BatchImport* importer = NULL; - GeeArrayList* _tmp34_ = NULL; - BatchImportRoll* _tmp35_ = NULL; - BatchImport* _tmp36_ = NULL; - BatchImport* _tmp37_ = NULL; - BatchImport* _tmp38_ = NULL; - GeeArrayList* _tmp39_ = NULL; - BatchImport* _tmp40_ = NULL; + GeeArrayList* _tmp34_; + BatchImportRoll* _tmp35_; + BatchImport* _tmp36_; + BatchImport* _tmp37_; + BatchImport* _tmp38_; + GeeArrayList* _tmp39_; + BatchImport* _tmp40_; #line 569 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (self), FALSE); #line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4585,7 +4419,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { result = FALSE; #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4589 "LibraryMonitor.c" +#line 4423 "LibraryMonitor.c" } #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->import_queue; @@ -4599,7 +4433,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { result = TRUE; #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4603 "LibraryMonitor.c" +#line 4437 "LibraryMonitor.c" } #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->current_batch_import; @@ -4609,7 +4443,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { result = TRUE; #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4613 "LibraryMonitor.c" +#line 4447 "LibraryMonitor.c" } #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = self->priv->import_queue; @@ -4635,29 +4469,29 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { if (_tmp13_ == NULL) { #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = TRUE; -#line 4639 "LibraryMonitor.c" +#line 4473 "LibraryMonitor.c" } else { - time_t _tmp14_ = 0; - time_t _tmp15_ = 0; + time_t _tmp14_; + time_t _tmp15_; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = now; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp15_ = self->priv->last_import_roll_use; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = (_tmp14_ - _tmp15_) >= ((time_t) LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC); -#line 4649 "LibraryMonitor.c" +#line 4483 "LibraryMonitor.c" } #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp12_) { -#line 4653 "LibraryMonitor.c" - BatchImportRoll* _tmp16_ = NULL; +#line 4487 "LibraryMonitor.c" + BatchImportRoll* _tmp16_; #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = batch_import_roll_new (); #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_roll_unref0 (self->priv->current_import_roll); #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->current_import_roll = _tmp16_; -#line 4661 "LibraryMonitor.c" +#line 4495 "LibraryMonitor.c" } #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = now; @@ -4667,11 +4501,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" jobs = _tmp18_; -#line 4671 "LibraryMonitor.c" +#line 4505 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashSet* _tmp19_ = NULL; - GeeIterator* _tmp20_ = NULL; + GeeHashSet* _tmp19_; + GeeIterator* _tmp20_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = self->priv->import_queue; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4680,20 +4514,20 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _file_it = _tmp20_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4684 "LibraryMonitor.c" - GeeIterator* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; +#line 4518 "LibraryMonitor.c" + GeeIterator* _tmp21_; + gboolean _tmp22_; GFile* file = NULL; - GeeIterator* _tmp23_ = NULL; - gpointer _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gboolean _tmp26_ = FALSE; - GeeArrayList* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - FileImportJob* _tmp29_ = NULL; - FileImportJob* _tmp30_ = NULL; - GeeHashSet* _tmp31_ = NULL; - GFile* _tmp32_ = NULL; + GeeIterator* _tmp23_; + gpointer _tmp24_; + GFile* _tmp25_; + gboolean _tmp26_; + GeeArrayList* _tmp27_; + GFile* _tmp28_; + FileImportJob* _tmp29_; + FileImportJob* _tmp30_; + GeeHashSet* _tmp31_; + GFile* _tmp32_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = _file_it; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4702,7 +4536,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { if (!_tmp22_) { #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4706 "LibraryMonitor.c" +#line 4540 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp23_ = _file_it; @@ -4720,7 +4554,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _g_object_unref0 (file); #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 4724 "LibraryMonitor.c" +#line 4558 "LibraryMonitor.c" } #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = jobs; @@ -4742,11 +4576,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 4746 "LibraryMonitor.c" +#line 4580 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4750 "LibraryMonitor.c" +#line 4584 "LibraryMonitor.c" } #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp33_ = self->priv->import_queue; @@ -4784,40 +4618,40 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _g_object_unref0 (jobs); #line 610 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4788 "LibraryMonitor.c" +#line 4622 "LibraryMonitor.c" } static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { #line 618 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_import_preparing ((LibraryMonitor*) self); -#line 4795 "LibraryMonitor.c" +#line 4629 "LibraryMonitor.c" } static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { #line 619 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_import_progress ((LibraryMonitor*) self, completed_bytes, total_bytes); -#line 4802 "LibraryMonitor.c" +#line 4636 "LibraryMonitor.c" } static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { #line 620 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_import_complete ((LibraryMonitor*) self, _sender, manifest, import_roll); -#line 4809 "LibraryMonitor.c" +#line 4643 "LibraryMonitor.c" } static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { gboolean _tmp0_ = FALSE; - BatchImport* _tmp1_ = NULL; - GeeArrayList* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - BatchImport* _tmp7_ = NULL; - BatchImport* _tmp8_ = NULL; - BatchImport* _tmp9_ = NULL; - BatchImport* _tmp10_ = NULL; + BatchImport* _tmp1_; + GeeArrayList* _tmp5_; + gpointer _tmp6_; + BatchImport* _tmp7_; + BatchImport* _tmp8_; + BatchImport* _tmp9_; + BatchImport* _tmp10_; #line 613 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4826,11 +4660,11 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { if (_tmp1_ != NULL) { #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 4830 "LibraryMonitor.c" +#line 4664 "LibraryMonitor.c" } else { - GeeArrayList* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GeeArrayList* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->batch_import_queue; #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4839,13 +4673,13 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { _tmp4_ = _tmp3_; #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_ == 0; -#line 4843 "LibraryMonitor.c" +#line 4677 "LibraryMonitor.c" } #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 615 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4849 "LibraryMonitor.c" +#line 4683 "LibraryMonitor.c" } #line 617 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->batch_import_queue; @@ -4871,26 +4705,26 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { _tmp10_ = self->priv->current_batch_import; #line 621 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" batch_import_schedule (_tmp10_); -#line 4875 "LibraryMonitor.c" +#line 4709 "LibraryMonitor.c" } static void library_monitor_discard_current_batch_import (LibraryMonitor* self) { - BatchImport* _tmp0_ = NULL; + BatchImport* _tmp0_; gboolean removed = FALSE; - GeeArrayList* _tmp1_ = NULL; - BatchImport* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - BatchImport* _tmp5_ = NULL; - guint _tmp6_ = 0U; - BatchImport* _tmp7_ = NULL; - guint _tmp8_ = 0U; - BatchImport* _tmp9_ = NULL; - guint _tmp10_ = 0U; - GeeArrayList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + GeeArrayList* _tmp1_; + BatchImport* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + BatchImport* _tmp5_; + guint _tmp6_; + BatchImport* _tmp7_; + guint _tmp8_; + BatchImport* _tmp9_; + guint _tmp10_; + GeeArrayList* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 624 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 625 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4939,43 +4773,43 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self) _tmp13_ = _tmp12_; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp13_ == 0) { -#line 4943 "LibraryMonitor.c" - GeeHashSet* _tmp14_ = NULL; +#line 4777 "LibraryMonitor.c" + GeeHashSet* _tmp14_; #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = self->priv->pending_imports; #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 4949 "LibraryMonitor.c" +#line 4783 "LibraryMonitor.c" } } static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { gint ctr = 0; - BatchImport* _tmp16_ = NULL; - GeeHashSet* _tmp18_ = NULL; + BatchImport* _tmp16_; + GeeHashSet* _tmp18_; #line 643 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 645 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ctr = 0; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4964 "LibraryMonitor.c" - gint _tmp0_ = 0; - GeeArrayList* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - GeeArrayList* _tmp4_ = NULL; - gint _tmp5_ = 0; - gpointer _tmp6_ = NULL; - BatchImport* _tmp7_ = NULL; - BatchImport* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - GeeArrayList* _tmp11_ = NULL; - GeeArrayList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - BatchImport* _tmp15_ = NULL; +#line 4798 "LibraryMonitor.c" + gint _tmp0_; + GeeArrayList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + GeeArrayList* _tmp4_; + gint _tmp5_; + gpointer _tmp6_; + BatchImport* _tmp7_; + BatchImport* _tmp8_; + gboolean _tmp9_; + GeeArrayList* _tmp11_; + GeeArrayList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + BatchImport* _tmp15_; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = ctr; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4988,7 +4822,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { if (!(_tmp0_ < _tmp3_)) { #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4992 "LibraryMonitor.c" +#line 4826 "LibraryMonitor.c" } #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->batch_import_queue; @@ -5006,15 +4840,15 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { _g_object_unref0 (_tmp7_); #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp9_) { -#line 5010 "LibraryMonitor.c" - gint _tmp10_ = 0; +#line 4844 "LibraryMonitor.c" + gint _tmp10_; #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = ctr; #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ctr = _tmp10_ + 1; #line 650 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5018 "LibraryMonitor.c" +#line 4852 "LibraryMonitor.c" } #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = self->priv->batch_import_queue; @@ -5030,25 +4864,25 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_tmp15_); -#line 5034 "LibraryMonitor.c" +#line 4868 "LibraryMonitor.c" } #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = self->priv->current_batch_import; #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp16_ != NULL) { -#line 5040 "LibraryMonitor.c" - BatchImport* _tmp17_ = NULL; +#line 4874 "LibraryMonitor.c" + BatchImport* _tmp17_; #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = self->priv->current_batch_import; #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" batch_import_user_halt (_tmp17_); -#line 5046 "LibraryMonitor.c" +#line 4880 "LibraryMonitor.c" } #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = self->priv->pending_imports; #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 5052 "LibraryMonitor.c" +#line 4886 "LibraryMonitor.c" } @@ -5056,14 +4890,14 @@ static void library_monitor_on_import_preparing (LibraryMonitor* self) { #line 664 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 665 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (self, "auto-import-preparing"); -#line 5061 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL], 0); +#line 4895 "LibraryMonitor.c" } static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 completed_bytes, guint64 total_bytes) { - guint64 _tmp0_ = 0ULL; - guint64 _tmp1_ = 0ULL; + guint64 _tmp0_; + guint64 _tmp1_; #line 668 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5071,29 +4905,29 @@ static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 co #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = total_bytes; #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (self, "auto-import-progress", _tmp0_, _tmp1_); -#line 5076 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, _tmp0_, _tmp1_); +#line 4910 "LibraryMonitor.c" } static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) { - BatchImport* _tmp0_ = NULL; - BatchImport* _tmp1_ = NULL; - ImportManifest* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - ImportManifest* _tmp25_ = NULL; - GeeList* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - GeeHashSet* _tmp59_ = NULL; - gint _tmp60_ = 0; - gint _tmp61_ = 0; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; + BatchImport* _tmp0_; + BatchImport* _tmp1_; + ImportManifest* _tmp2_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + ImportManifest* _tmp25_; + GeeList* _tmp26_; + gint _tmp27_; + gint _tmp28_; + GeeHashSet* _tmp59_; + gint _tmp60_; + gint _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; GError * _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); @@ -5126,17 +4960,17 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp7_); #line 677 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit_by_name (self, "auto-import-progress", (guint64) 0, (guint64) 0); -#line 5131 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, (guint64) 0, (guint64) 0); +#line 4965 "LibraryMonitor.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; - GeeList* _tmp10_ = NULL; + ImportManifest* _tmp8_; + GeeList* _tmp9_; + GeeList* _tmp10_; gint _result_size = 0; - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + GeeList* _tmp11_; + gint _tmp12_; + gint _tmp13_; gint _result_index = 0; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = manifest; @@ -5158,16 +4992,16 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _result_index = -1; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5162 "LibraryMonitor.c" - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gint _tmp16_ = 0; +#line 4996 "LibraryMonitor.c" + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; BatchImportResult* _result_ = NULL; - GeeList* _tmp17_ = NULL; - gint _tmp18_ = 0; - gpointer _tmp19_ = NULL; - BatchImportResult* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; + GeeList* _tmp17_; + gint _tmp18_; + gpointer _tmp19_; + BatchImportResult* _tmp20_; + GFile* _tmp21_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5180,7 +5014,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor if (!(_tmp15_ < _tmp16_)) { #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5184 "LibraryMonitor.c" +#line 5018 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = _result_list; @@ -5196,10 +5030,10 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _tmp21_ = _tmp20_->file; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp21_ != NULL) { -#line 5200 "LibraryMonitor.c" - GeeHashSet* _tmp22_ = NULL; - BatchImportResult* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; +#line 5034 "LibraryMonitor.c" + GeeHashSet* _tmp22_; + BatchImportResult* _tmp23_; + GFile* _tmp24_; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp22_ = self->priv->pending_imports; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5208,15 +5042,15 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _tmp24_ = _tmp23_->file; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); -#line 5212 "LibraryMonitor.c" +#line 5046 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5216 "LibraryMonitor.c" +#line 5050 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5220 "LibraryMonitor.c" +#line 5054 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = manifest; @@ -5228,23 +5062,23 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _tmp28_ = _tmp27_; #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp28_ > 0) { -#line 5232 "LibraryMonitor.c" +#line 5066 "LibraryMonitor.c" GeeArrayList* to_tombstone = NULL; - GeeArrayList* _tmp29_ = NULL; + GeeArrayList* _tmp29_; #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL); #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_tombstone = _tmp29_; -#line 5239 "LibraryMonitor.c" +#line 5073 "LibraryMonitor.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp30_ = NULL; - GeeList* _tmp31_ = NULL; - GeeList* _tmp32_ = NULL; + ImportManifest* _tmp30_; + GeeList* _tmp31_; + GeeList* _tmp32_; gint _result_size = 0; - GeeList* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + GeeList* _tmp33_; + gint _tmp34_; + gint _tmp35_; gint _result_index = 0; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp30_ = manifest; @@ -5266,26 +5100,26 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _result_index = -1; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5270 "LibraryMonitor.c" - gint _tmp36_ = 0; - gint _tmp37_ = 0; - gint _tmp38_ = 0; +#line 5104 "LibraryMonitor.c" + gint _tmp36_; + gint _tmp37_; + gint _tmp38_; BatchImportResult* _result_ = NULL; - GeeList* _tmp39_ = NULL; - gint _tmp40_ = 0; - gpointer _tmp41_ = NULL; + GeeList* _tmp39_; + gint _tmp40_; + gpointer _tmp41_; GFileInfo* info = NULL; - BatchImportResult* _tmp42_ = NULL; - GFile* _tmp43_ = NULL; - GFileInfo* _tmp44_ = NULL; - GFileInfo* _tmp45_ = NULL; - GeeArrayList* _tmp50_ = NULL; - BatchImportResult* _tmp51_ = NULL; - GFile* _tmp52_ = NULL; - GFileInfo* _tmp53_ = NULL; - gint64 _tmp54_ = 0LL; - TombstonedFile* _tmp55_ = NULL; - TombstonedFile* _tmp56_ = NULL; + BatchImportResult* _tmp42_; + GFile* _tmp43_; + GFileInfo* _tmp44_; + GFileInfo* _tmp45_; + GeeArrayList* _tmp50_; + BatchImportResult* _tmp51_; + GFile* _tmp52_; + GFileInfo* _tmp53_; + gint64 _tmp54_; + TombstonedFile* _tmp55_; + TombstonedFile* _tmp56_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5298,7 +5132,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor if (!(_tmp37_ < _tmp38_)) { #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5302 "LibraryMonitor.c" +#line 5136 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp39_ = _result_list; @@ -5320,11 +5154,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _tmp45_ = info; #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp45_ == NULL) { -#line 5324 "LibraryMonitor.c" - BatchImportResult* _tmp46_ = NULL; - GFile* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; +#line 5158 "LibraryMonitor.c" + BatchImportResult* _tmp46_; + GFile* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp46_ = _result_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5343,7 +5177,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _batch_import_result_unref0 (_result_); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5347 "LibraryMonitor.c" +#line 5181 "LibraryMonitor.c" } #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp50_ = to_tombstone; @@ -5367,14 +5201,14 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _g_object_unref0 (info); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5371 "LibraryMonitor.c" +#line 5205 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5375 "LibraryMonitor.c" +#line 5209 "LibraryMonitor.c" } { - GeeArrayList* _tmp57_ = NULL; + GeeArrayList* _tmp57_; #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp57_ = to_tombstone; #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5383,8 +5217,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor if (G_UNLIKELY (_inner_error_ != NULL)) { #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5387 "LibraryMonitor.c" - goto __catch486_database_error; +#line 5221 "LibraryMonitor.c" + goto __catch487_database_error; } #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_tombstone); @@ -5394,14 +5228,14 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor g_clear_error (&_inner_error_); #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5398 "LibraryMonitor.c" +#line 5232 "LibraryMonitor.c" } } - goto __finally486; - __catch486_database_error: + goto __finally487; + __catch487_database_error: { GError* err = NULL; - GError* _tmp58_ = NULL; + GError* _tmp58_; #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5412,9 +5246,9 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor app_window_database_error (_tmp58_); #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (err); -#line 5416 "LibraryMonitor.c" +#line 5250 "LibraryMonitor.c" } - __finally486: + __finally487: #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5425,11 +5259,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor g_clear_error (&_inner_error_); #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5429 "LibraryMonitor.c" +#line 5263 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_tombstone); -#line 5433 "LibraryMonitor.c" +#line 5267 "LibraryMonitor.c" } #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp59_ = self->priv->pending_imports; @@ -5449,17 +5283,17 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor library_monitor_discard_current_batch_import (self); #line 709 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_schedule_next_batch_import (self); -#line 5453 "LibraryMonitor.c" +#line 5287 "LibraryMonitor.c" } void library_monitor_blacklist_file (GFile* file, const gchar* reason) { - const gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; GError * _inner_error_ = NULL; #line 725 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); @@ -5483,33 +5317,33 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) { _g_free0 (_tmp5_); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp3_); -#line 5487 "LibraryMonitor.c" +#line 5321 "LibraryMonitor.c" { - GeeHashSet* _tmp6_ = NULL; + GeeHashSet* _tmp6_; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = library_monitor_blacklist; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5494 "LibraryMonitor.c" +#line 5328 "LibraryMonitor.c" { - GeeHashSet* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; + GeeHashSet* _tmp7_; + GFile* _tmp8_; #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = library_monitor_blacklist; #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = file; #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); -#line 5504 "LibraryMonitor.c" +#line 5338 "LibraryMonitor.c" } - __finally487: + __finally488: { - GeeHashSet* _tmp9_ = NULL; + GeeHashSet* _tmp9_; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = library_monitor_blacklist; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5513 "LibraryMonitor.c" +#line 5347 "LibraryMonitor.c" } #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5519,7 +5353,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) { g_clear_error (&_inner_error_); #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5523 "LibraryMonitor.c" +#line 5357 "LibraryMonitor.c" } } } @@ -5529,19 +5363,19 @@ void library_monitor_unblacklist_file (GFile* file) { GError * _inner_error_ = NULL; #line 732 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 5533 "LibraryMonitor.c" +#line 5367 "LibraryMonitor.c" { - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5540 "LibraryMonitor.c" +#line 5374 "LibraryMonitor.c" { gboolean _tmp1_ = FALSE; - GeeHashSet* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeHashSet* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = library_monitor_blacklist; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5550,10 +5384,10 @@ void library_monitor_unblacklist_file (GFile* file) { _tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp4_) { -#line 5554 "LibraryMonitor.c" - HashTimedQueue* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 5388 "LibraryMonitor.c" + HashTimedQueue* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = library_monitor_to_unblacklist; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5562,34 +5396,34 @@ void library_monitor_unblacklist_file (GFile* file) { _tmp7_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_TIMED_QUEUE, TimedQueue), _tmp6_); #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = !_tmp7_; -#line 5566 "LibraryMonitor.c" +#line 5400 "LibraryMonitor.c" } else { #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5570 "LibraryMonitor.c" +#line 5404 "LibraryMonitor.c" } #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5574 "LibraryMonitor.c" - HashTimedQueue* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; +#line 5408 "LibraryMonitor.c" + HashTimedQueue* _tmp8_; + GFile* _tmp9_; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = library_monitor_to_unblacklist; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = file; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TIMED_QUEUE, TimedQueue), _tmp9_); -#line 5583 "LibraryMonitor.c" +#line 5417 "LibraryMonitor.c" } } - __finally488: + __finally489: { - GeeHashSet* _tmp10_ = NULL; + GeeHashSet* _tmp10_; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = library_monitor_blacklist; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5593 "LibraryMonitor.c" +#line 5427 "LibraryMonitor.c" } #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5599,7 +5433,7 @@ void library_monitor_unblacklist_file (GFile* file) { g_clear_error (&_inner_error_); #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5603 "LibraryMonitor.c" +#line 5437 "LibraryMonitor.c" } } } @@ -5610,18 +5444,18 @@ static void library_monitor_on_unblacklist_file (GFile* file) { GError * _inner_error_ = NULL; #line 741 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 5614 "LibraryMonitor.c" +#line 5448 "LibraryMonitor.c" { - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5621 "LibraryMonitor.c" +#line 5455 "LibraryMonitor.c" { - GeeHashSet* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeHashSet* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_blacklist; #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5630,16 +5464,16 @@ static void library_monitor_on_unblacklist_file (GFile* file) { _tmp3_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" removed = _tmp3_; -#line 5634 "LibraryMonitor.c" +#line 5468 "LibraryMonitor.c" } - __finally489: + __finally490: { - GeeHashSet* _tmp4_ = NULL; + GeeHashSet* _tmp4_; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = library_monitor_blacklist; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5643 "LibraryMonitor.c" +#line 5477 "LibraryMonitor.c" } #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5649,17 +5483,17 @@ static void library_monitor_on_unblacklist_file (GFile* file) { g_clear_error (&_inner_error_); #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5653 "LibraryMonitor.c" +#line 5487 "LibraryMonitor.c" } } #line 747 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (removed) { -#line 5658 "LibraryMonitor.c" - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 5492 "LibraryMonitor.c" + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = file; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5676,11 +5510,11 @@ static void library_monitor_on_unblacklist_file (GFile* file) { _g_free0 (_tmp9_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp7_); -#line 5680 "LibraryMonitor.c" +#line 5514 "LibraryMonitor.c" } else { - GFile* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + GFile* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = file; #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5691,7 +5525,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) { g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp12_); #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp12_); -#line 5695 "LibraryMonitor.c" +#line 5529 "LibraryMonitor.c" } } @@ -5701,19 +5535,19 @@ gboolean library_monitor_is_blacklisted (GFile* file) { GError * _inner_error_ = NULL; #line 753 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 5705 "LibraryMonitor.c" +#line 5539 "LibraryMonitor.c" { - GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp0_; gboolean _tmp6_ = FALSE; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5713 "LibraryMonitor.c" +#line 5547 "LibraryMonitor.c" { - GeeHashSet* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeHashSet* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_blacklist; #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5722,27 +5556,27 @@ gboolean library_monitor_is_blacklisted (GFile* file) { _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = _tmp3_; -#line 5726 "LibraryMonitor.c" +#line 5560 "LibraryMonitor.c" { - GeeHashSet* _tmp4_ = NULL; + GeeHashSet* _tmp4_; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5733 "LibraryMonitor.c" +#line 5567 "LibraryMonitor.c" } #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5737 "LibraryMonitor.c" +#line 5571 "LibraryMonitor.c" } - __finally490: + __finally491: { - GeeHashSet* _tmp5_ = NULL; + GeeHashSet* _tmp5_; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5746 "LibraryMonitor.c" +#line 5580 "LibraryMonitor.c" } #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5750,19 +5584,19 @@ gboolean library_monitor_is_blacklisted (GFile* file) { g_clear_error (&_inner_error_); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return _tmp6_; -#line 5754 "LibraryMonitor.c" +#line 5588 "LibraryMonitor.c" } } static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file) { gboolean result = FALSE; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - MediaSourceCollection* _tmp3_ = NULL; - MediaSourceCollection* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GFile* _tmp2_; + MediaSourceCollection* _tmp3_; + MediaSourceCollection* _tmp4_; + gboolean _tmp5_; #line 759 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (self), FALSE); #line 759 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5787,14 +5621,14 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi result = _tmp5_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5791 "LibraryMonitor.c" +#line 5625 "LibraryMonitor.c" } static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; GeeArrayList* to_import = NULL; - GeeArrayList* _tmp42_ = NULL; + GeeArrayList* _tmp42_; #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 766 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5803,17 +5637,17 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp0_) { #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5807 "LibraryMonitor.c" +#line 5641 "LibraryMonitor.c" } #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = NULL; -#line 5811 "LibraryMonitor.c" +#line 5645 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; + GeeIterator* _tmp4_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = directory_monitor_get_files (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5828,30 +5662,30 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _file_it = _tmp4_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5832 "LibraryMonitor.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 5666 "LibraryMonitor.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; GFile* file = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; GFileInfo* info = NULL; - GFile* _tmp9_ = NULL; - GFileInfo* _tmp10_ = NULL; + GFile* _tmp9_; + GFileInfo* _tmp10_; gboolean _tmp11_ = FALSE; - GFileInfo* _tmp12_ = NULL; - GeeHashSet* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - TombstoneSourceCollection* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + GFileInfo* _tmp12_; + GeeHashSet* _tmp15_; + GFile* _tmp16_; + gboolean _tmp17_; + TombstoneSourceCollection* _tmp18_; + GFile* _tmp19_; + gboolean _tmp20_; gboolean represented = FALSE; - gboolean _tmp35_ = FALSE; - GFile* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; - GeeArrayList* _tmp38_ = NULL; - GeeArrayList* _tmp40_ = NULL; - GFile* _tmp41_ = NULL; + gboolean _tmp35_; + GFile* _tmp36_; + gboolean _tmp37_; + GeeArrayList* _tmp38_; + GeeArrayList* _tmp40_; + GFile* _tmp41_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _file_it; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5860,7 +5694,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp6_) { #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5864 "LibraryMonitor.c" +#line 5698 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = _file_it; @@ -5880,17 +5714,17 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (_tmp12_ == NULL) { #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = TRUE; -#line 5884 "LibraryMonitor.c" +#line 5718 "LibraryMonitor.c" } else { - GFileInfo* _tmp13_ = NULL; - GFileType _tmp14_ = 0; + GFileInfo* _tmp13_; + GFileType _tmp14_; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = info; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = g_file_info_get_file_type (_tmp13_); #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR; -#line 5894 "LibraryMonitor.c" +#line 5728 "LibraryMonitor.c" } #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp11_) { @@ -5900,7 +5734,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5904 "LibraryMonitor.c" +#line 5738 "LibraryMonitor.c" } #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp15_ = self->priv->pending_imports; @@ -5916,7 +5750,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5920 "LibraryMonitor.c" +#line 5754 "LibraryMonitor.c" } #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = tombstone_global; @@ -5932,19 +5766,19 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5936 "LibraryMonitor.c" +#line 5770 "LibraryMonitor.c" } #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = FALSE; -#line 5940 "LibraryMonitor.c" +#line 5774 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp21_ = NULL; - GeeList* _tmp22_ = NULL; + GeeList* _tmp21_; + GeeList* _tmp22_; gint _monitor_size = 0; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; + GeeList* _tmp23_; + gint _tmp24_; + gint _tmp25_; gint _monitor_index = 0; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = self->priv->monitors; @@ -5964,17 +5798,17 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _monitor_index = -1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5968 "LibraryMonitor.c" - gint _tmp26_ = 0; - gint _tmp27_ = 0; - gint _tmp28_ = 0; +#line 5802 "LibraryMonitor.c" + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; MediaMonitor* monitor = NULL; - GeeList* _tmp29_ = NULL; - gint _tmp30_ = 0; - gpointer _tmp31_ = NULL; - MediaMonitor* _tmp32_ = NULL; - GFile* _tmp33_ = NULL; - gboolean _tmp34_ = FALSE; + GeeList* _tmp29_; + gint _tmp30_; + gpointer _tmp31_; + MediaMonitor* _tmp32_; + GFile* _tmp33_; + gboolean _tmp34_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5987,7 +5821,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!(_tmp27_ < _tmp28_)) { #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5991 "LibraryMonitor.c" +#line 5825 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp29_ = _monitor_list; @@ -6011,15 +5845,15 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (monitor); #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6015 "LibraryMonitor.c" +#line 5849 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6019 "LibraryMonitor.c" +#line 5853 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6023 "LibraryMonitor.c" +#line 5857 "LibraryMonitor.c" } #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp35_ = represented; @@ -6031,7 +5865,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 6035 "LibraryMonitor.c" +#line 5869 "LibraryMonitor.c" } #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = file; @@ -6045,21 +5879,21 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 6049 "LibraryMonitor.c" +#line 5883 "LibraryMonitor.c" } #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp38_ = to_import; #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp38_ == NULL) { -#line 6055 "LibraryMonitor.c" - GeeArrayList* _tmp39_ = NULL; +#line 5889 "LibraryMonitor.c" + GeeArrayList* _tmp39_; #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = _tmp39_; -#line 6063 "LibraryMonitor.c" +#line 5897 "LibraryMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp40_ = to_import; @@ -6071,34 +5905,34 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (info); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 6075 "LibraryMonitor.c" +#line 5909 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 6079 "LibraryMonitor.c" +#line 5913 "LibraryMonitor.c" } #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp42_ = to_import; #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp42_ != NULL) { -#line 6085 "LibraryMonitor.c" - GeeArrayList* _tmp43_ = NULL; +#line 5919 "LibraryMonitor.c" + GeeArrayList* _tmp43_; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp43_ = to_import; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 6091 "LibraryMonitor.c" +#line 5925 "LibraryMonitor.c" } #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); -#line 6095 "LibraryMonitor.c" +#line 5929 "LibraryMonitor.c" } static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, GFile* file) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 808 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 808 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6107,27 +5941,27 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp2_ = self->priv->auto_import; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp2_) { -#line 6111 "LibraryMonitor.c" - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 5945 "LibraryMonitor.c" + GFile* _tmp3_; + gboolean _tmp4_; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = file; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_); #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp4_; -#line 6120 "LibraryMonitor.c" +#line 5954 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 6124 "LibraryMonitor.c" +#line 5958 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 6128 "LibraryMonitor.c" - TombstoneSourceCollection* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 5962 "LibraryMonitor.c" + TombstoneSourceCollection* _tmp5_; + GFile* _tmp6_; + gboolean _tmp7_; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = tombstone_global; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6136,21 +5970,21 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp7_ = tombstone_source_collection_matches (_tmp5_, _tmp6_); #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = !_tmp7_; -#line 6140 "LibraryMonitor.c" +#line 5974 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 6144 "LibraryMonitor.c" +#line 5978 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6148 "LibraryMonitor.c" - GFile* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; +#line 5982 "LibraryMonitor.c" + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + GFile* _tmp13_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = file; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6171,20 +6005,20 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp13_ = file; #line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_enqueue_import (self, _tmp13_); -#line 6175 "LibraryMonitor.c" +#line 6009 "LibraryMonitor.c" } } static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GFile* file, GFileInfo* info) { LibraryMonitor * self; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp19_ = FALSE; - gboolean _tmp98_ = FALSE; - GFile* _tmp100_ = NULL; - GFileInfo* _tmp101_ = NULL; + gboolean _tmp19_; + gboolean _tmp98_; + GFile* _tmp100_; + GFileInfo* _tmp101_; #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6197,9 +6031,9 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 6201 "LibraryMonitor.c" - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; +#line 6035 "LibraryMonitor.c" + GFile* _tmp2_; + GFileInfo* _tmp3_; #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6208,19 +6042,19 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_); #line 819 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6212 "LibraryMonitor.c" +#line 6046 "LibraryMonitor.c" } #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6216 "LibraryMonitor.c" +#line 6050 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; + GeeList* _tmp4_; + GeeList* _tmp5_; gint _monitor_size = 0; - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _monitor_index = 0; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->monitors; @@ -6240,18 +6074,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _monitor_index = -1; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6244 "LibraryMonitor.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 6078 "LibraryMonitor.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; MediaMonitor* monitor = NULL; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - MediaMonitor* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - GFileInfo* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + MediaMonitor* _tmp15_; + GFile* _tmp16_; + GFileInfo* _tmp17_; + gboolean _tmp18_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6264,7 +6098,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (!(_tmp10_ < _tmp11_)) { #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6268 "LibraryMonitor.c" +#line 6102 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = _monitor_list; @@ -6290,36 +6124,36 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6294 "LibraryMonitor.c" +#line 6128 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6298 "LibraryMonitor.c" +#line 6132 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6302 "LibraryMonitor.c" +#line 6136 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = known; #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp19_) { -#line 6308 "LibraryMonitor.c" +#line 6142 "LibraryMonitor.c" GeeHashSet* all_candidates = NULL; gboolean _tmp78_ = FALSE; gboolean _tmp79_ = FALSE; - gboolean _tmp80_ = FALSE; + gboolean _tmp80_; #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = NULL; -#line 6315 "LibraryMonitor.c" +#line 6149 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp20_ = NULL; - GeeList* _tmp21_ = NULL; + GeeList* _tmp20_; + GeeList* _tmp21_; gint _monitor_size = 0; - GeeList* _tmp22_ = NULL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; gint _monitor_index = 0; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp20_ = self->priv->monitors; @@ -6339,23 +6173,23 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _monitor_index = -1; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6343 "LibraryMonitor.c" - gint _tmp25_ = 0; - gint _tmp26_ = 0; - gint _tmp27_ = 0; +#line 6177 "LibraryMonitor.c" + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; MediaMonitor* monitor = NULL; - GeeList* _tmp28_ = NULL; - gint _tmp29_ = 0; - gpointer _tmp30_ = NULL; + GeeList* _tmp28_; + gint _tmp29_; + gpointer _tmp30_; MediaMonitorDiscoveredFile _result_ = 0; GeeCollection* candidates = NULL; - MediaMonitor* _tmp31_ = NULL; - GFile* _tmp32_ = NULL; - GFileInfo* _tmp33_ = NULL; + MediaMonitor* _tmp31_; + GFile* _tmp32_; + GFileInfo* _tmp33_; MediaMonitorDiscoveredFile _tmp34_ = 0; - GeeCollection* _tmp35_ = NULL; + GeeCollection* _tmp35_; gboolean _tmp36_ = FALSE; - MediaMonitorDiscoveredFile _tmp37_ = 0; + MediaMonitorDiscoveredFile _tmp37_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6368,7 +6202,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (!(_tmp26_ < _tmp27_)) { #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6372 "LibraryMonitor.c" +#line 6206 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = _monitor_list; @@ -6396,28 +6230,28 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (_tmp37_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = TRUE; -#line 6400 "LibraryMonitor.c" +#line 6234 "LibraryMonitor.c" } else { - MediaMonitorDiscoveredFile _tmp38_ = 0; + MediaMonitorDiscoveredFile _tmp38_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp38_ = _result_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = _tmp38_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 6407 "LibraryMonitor.c" +#line 6241 "LibraryMonitor.c" } #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp36_) { -#line 6411 "LibraryMonitor.c" - MediaMonitor* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - MediaMonitorDiscoveredFile _tmp42_ = 0; +#line 6245 "LibraryMonitor.c" + MediaMonitor* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + MediaMonitorDiscoveredFile _tmp42_; GEnumValue* _tmp43_; - GFile* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; + GFile* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp39_ = monitor; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6454,18 +6288,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6458 "LibraryMonitor.c" +#line 6292 "LibraryMonitor.c" } else { gboolean _tmp49_ = FALSE; - GeeCollection* _tmp50_ = NULL; + GeeCollection* _tmp50_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp50_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp50_ != NULL) { -#line 6466 "LibraryMonitor.c" - GeeCollection* _tmp51_ = NULL; - gint _tmp52_ = 0; - gint _tmp53_ = 0; +#line 6300 "LibraryMonitor.c" + GeeCollection* _tmp51_; + gint _tmp52_; + gint _tmp53_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp51_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6474,27 +6308,27 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp53_ = _tmp52_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp49_ = _tmp53_ > 0; -#line 6478 "LibraryMonitor.c" +#line 6312 "LibraryMonitor.c" } else { #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp49_ = FALSE; -#line 6482 "LibraryMonitor.c" +#line 6316 "LibraryMonitor.c" } #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp49_) { -#line 6486 "LibraryMonitor.c" - MediaMonitor* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - GeeCollection* _tmp57_ = NULL; - gint _tmp58_ = 0; - gint _tmp59_ = 0; - GFile* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - GeeHashSet* _tmp65_ = NULL; +#line 6320 "LibraryMonitor.c" + MediaMonitor* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + GeeCollection* _tmp57_; + gint _tmp58_; + gint _tmp59_; + GFile* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GeeHashSet* _tmp65_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp54_ = monitor; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6529,20 +6363,20 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp65_ = all_candidates; #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp65_ == NULL) { -#line 6533 "LibraryMonitor.c" - GeeHashSet* _tmp66_ = NULL; +#line 6367 "LibraryMonitor.c" + GeeHashSet* _tmp66_; #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = _tmp66_; -#line 6541 "LibraryMonitor.c" +#line 6375 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp67_ = NULL; - GeeIterator* _tmp68_ = NULL; + GeeCollection* _tmp67_; + GeeIterator* _tmp68_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp67_ = candidates; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6551,15 +6385,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _candidate_it = _tmp68_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6555 "LibraryMonitor.c" - GeeIterator* _tmp69_ = NULL; - gboolean _tmp70_ = FALSE; +#line 6389 "LibraryMonitor.c" + GeeIterator* _tmp69_; + gboolean _tmp70_; Monitorable* candidate = NULL; - GeeIterator* _tmp71_ = NULL; - gpointer _tmp72_ = NULL; - MediaMonitor* _tmp73_ = NULL; - Monitorable* _tmp74_ = NULL; - gboolean _tmp75_ = FALSE; + GeeIterator* _tmp71_; + gpointer _tmp72_; + MediaMonitor* _tmp73_; + Monitorable* _tmp74_; + gboolean _tmp75_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp69_ = _candidate_it; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6568,7 +6402,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF if (!_tmp70_) { #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6572 "LibraryMonitor.c" +#line 6406 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp71_ = _candidate_it; @@ -6584,24 +6418,24 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp75_ = media_monitor_is_offline (_tmp73_, _tmp74_); #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp75_) { -#line 6588 "LibraryMonitor.c" - GeeHashSet* _tmp76_ = NULL; - Monitorable* _tmp77_ = NULL; +#line 6422 "LibraryMonitor.c" + GeeHashSet* _tmp76_; + Monitorable* _tmp77_; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp76_ = all_candidates; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp77_ = candidate; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp77_); -#line 6597 "LibraryMonitor.c" +#line 6431 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 6601 "LibraryMonitor.c" +#line 6435 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 6605 "LibraryMonitor.c" +#line 6439 "LibraryMonitor.c" } } } @@ -6609,34 +6443,34 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (candidates); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6613 "LibraryMonitor.c" +#line 6447 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6617 "LibraryMonitor.c" +#line 6451 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp80_ = known; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp80_) { -#line 6623 "LibraryMonitor.c" - GeeHashSet* _tmp81_ = NULL; +#line 6457 "LibraryMonitor.c" + GeeHashSet* _tmp81_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp81_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp79_ = _tmp81_ != NULL; -#line 6629 "LibraryMonitor.c" +#line 6463 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp79_ = FALSE; -#line 6633 "LibraryMonitor.c" +#line 6467 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp79_) { -#line 6637 "LibraryMonitor.c" - GeeHashSet* _tmp82_ = NULL; - gint _tmp83_ = 0; - gint _tmp84_ = 0; +#line 6471 "LibraryMonitor.c" + GeeHashSet* _tmp82_; + gint _tmp83_; + gint _tmp84_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp82_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6645,28 +6479,28 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp84_ = _tmp83_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp78_ = _tmp84_ > 0; -#line 6649 "LibraryMonitor.c" +#line 6483 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp78_ = FALSE; -#line 6653 "LibraryMonitor.c" +#line 6487 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp78_) { -#line 6657 "LibraryMonitor.c" - GeeHashSet* _tmp85_ = NULL; - gint _tmp86_ = 0; - gint _tmp87_ = 0; - GFile* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; - gchar* _tmp90_ = NULL; - gchar* _tmp91_ = NULL; - gchar* _tmp92_ = NULL; - Workers* _tmp93_ = NULL; - GFile* _tmp94_ = NULL; - GeeHashSet* _tmp95_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp96_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp97_ = NULL; +#line 6491 "LibraryMonitor.c" + GeeHashSet* _tmp85_; + gint _tmp86_; + gint _tmp87_; + GFile* _tmp88_; + gchar* _tmp89_; + gchar* _tmp90_; + gchar* _tmp91_; + gchar* _tmp92_; + Workers* _tmp93_; + GFile* _tmp94_; + GeeHashSet* _tmp95_; + LibraryMonitorRuntimeFindMoveJob* _tmp96_; + LibraryMonitorRuntimeFindMoveJob* _tmp97_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp85_ = all_candidates; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6705,23 +6539,23 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _background_job_unref0 (_tmp97_); #line 866 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; -#line 6709 "LibraryMonitor.c" +#line 6543 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); -#line 6713 "LibraryMonitor.c" +#line 6547 "LibraryMonitor.c" } #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp98_ = known; #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp98_) { -#line 6719 "LibraryMonitor.c" - GFile* _tmp99_ = NULL; +#line 6553 "LibraryMonitor.c" + GFile* _tmp99_; #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp99_ = file; #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp99_); -#line 6725 "LibraryMonitor.c" +#line 6559 "LibraryMonitor.c" } #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp100_ = file; @@ -6729,18 +6563,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp101_ = info; #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp100_, _tmp101_); -#line 6733 "LibraryMonitor.c" +#line 6567 "LibraryMonitor.c" } static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, BackgroundJob* j) { LibraryMonitorRuntimeFindMoveJob* job = NULL; - BackgroundJob* _tmp0_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp1_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp2_ = NULL; - GError* _tmp3_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp11_ = NULL; - Monitorable* _tmp12_ = NULL; + BackgroundJob* _tmp0_; + LibraryMonitorRuntimeFindMoveJob* _tmp1_; + LibraryMonitorRuntimeFindMoveJob* _tmp2_; + GError* _tmp3_; + LibraryMonitorRuntimeFindMoveJob* _tmp11_; + Monitorable* _tmp12_; #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6757,14 +6591,14 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self _tmp3_ = _tmp2_->err; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp3_ != NULL) { -#line 6761 "LibraryMonitor.c" - LibraryMonitorRuntimeFindMoveJob* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp8_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; +#line 6595 "LibraryMonitor.c" + LibraryMonitorRuntimeFindMoveJob* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + LibraryMonitorRuntimeFindMoveJob* _tmp8_; + GError* _tmp9_; + const gchar* _tmp10_; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = job; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6784,7 +6618,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self "or %s: %s", _tmp7_, _tmp10_); #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp7_); -#line 6787 "LibraryMonitor.c" +#line 6621 "LibraryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = job; @@ -6792,19 +6626,19 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self _tmp12_ = _tmp11_->match; #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp12_ != NULL) { -#line 6795 "LibraryMonitor.c" +#line 6629 "LibraryMonitor.c" MediaMonitor* monitor = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp13_ = NULL; - Monitorable* _tmp14_ = NULL; - MediaMonitor* _tmp15_ = NULL; - MediaMonitor* _tmp16_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp17_ = NULL; - Monitorable* _tmp18_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - MediaMonitor* _tmp21_ = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp22_ = NULL; - Monitorable* _tmp23_ = NULL; + LibraryMonitorRuntimeFindMoveJob* _tmp13_; + Monitorable* _tmp14_; + MediaMonitor* _tmp15_; + MediaMonitor* _tmp16_; + LibraryMonitorRuntimeFindMoveJob* _tmp17_; + Monitorable* _tmp18_; + LibraryMonitorRuntimeFindMoveJob* _tmp19_; + GFile* _tmp20_; + MediaMonitor* _tmp21_; + LibraryMonitorRuntimeFindMoveJob* _tmp22_; + Monitorable* _tmp23_; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = job; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6835,34 +6669,34 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self media_monitor_update_online (_tmp21_, _tmp23_); #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6838 "LibraryMonitor.c" +#line 6672 "LibraryMonitor.c" } else { - LibraryMonitorRuntimeFindMoveJob* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; + LibraryMonitorRuntimeFindMoveJob* _tmp24_; + GFile* _tmp25_; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp24_ = job; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = _tmp24_->file; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6848 "LibraryMonitor.c" +#line 6682 "LibraryMonitor.c" } #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 6852 "LibraryMonitor.c" +#line 6686 "LibraryMonitor.c" } static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_info) { LibraryMonitor * self; gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp1_; + gboolean _tmp2_; gboolean known = FALSE; - gboolean _tmp24_ = FALSE; - GFile* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - GFileInfo* _tmp28_ = NULL; + gboolean _tmp24_; + GFile* _tmp26_; + GFile* _tmp27_; + GFileInfo* _tmp28_; #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6879,24 +6713,24 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil if (_tmp2_) { #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 6882 "LibraryMonitor.c" +#line 6716 "LibraryMonitor.c" } else { - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GFile* _tmp3_; + gboolean _tmp4_; #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = new_file; #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = library_monitor_is_blacklisted (_tmp3_); #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_; -#line 6892 "LibraryMonitor.c" +#line 6726 "LibraryMonitor.c" } #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6896 "LibraryMonitor.c" - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFileInfo* _tmp7_ = NULL; +#line 6730 "LibraryMonitor.c" + GFile* _tmp5_; + GFile* _tmp6_; + GFileInfo* _tmp7_; #line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = old_file; #line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6907,19 +6741,19 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp5_, _tmp6_, _tmp7_); #line 898 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6910 "LibraryMonitor.c" +#line 6744 "LibraryMonitor.c" } #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6914 "LibraryMonitor.c" +#line 6748 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp8_ = NULL; - GeeList* _tmp9_ = NULL; + GeeList* _tmp8_; + GeeList* _tmp9_; gint _monitor_size = 0; - GeeList* _tmp10_ = NULL; - gint _tmp11_ = 0; - gint _tmp12_ = 0; + GeeList* _tmp10_; + gint _tmp11_; + gint _tmp12_; gint _monitor_index = 0; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = self->priv->monitors; @@ -6939,19 +6773,19 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _monitor_index = -1; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6942 "LibraryMonitor.c" - gint _tmp13_ = 0; - gint _tmp14_ = 0; - gint _tmp15_ = 0; +#line 6776 "LibraryMonitor.c" + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; MediaMonitor* monitor = NULL; - GeeList* _tmp16_ = NULL; - gint _tmp17_ = 0; - gpointer _tmp18_ = NULL; - MediaMonitor* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - GFileInfo* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + GeeList* _tmp16_; + gint _tmp17_; + gpointer _tmp18_; + MediaMonitor* _tmp19_; + GFile* _tmp20_; + GFile* _tmp21_; + GFileInfo* _tmp22_; + gboolean _tmp23_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6964,7 +6798,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil if (!(_tmp14_ < _tmp15_)) { #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6967 "LibraryMonitor.c" +#line 6801 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = _monitor_list; @@ -6992,27 +6826,27 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _g_object_unref0 (monitor); #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6995 "LibraryMonitor.c" +#line 6829 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6999 "LibraryMonitor.c" +#line 6833 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7003 "LibraryMonitor.c" +#line 6837 "LibraryMonitor.c" } #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp24_ = known; #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp24_) { -#line 7009 "LibraryMonitor.c" - GFile* _tmp25_ = NULL; +#line 6843 "LibraryMonitor.c" + GFile* _tmp25_; #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = new_file; #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 7015 "LibraryMonitor.c" +#line 6849 "LibraryMonitor.c" } #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = old_file; @@ -7022,17 +6856,17 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _tmp28_ = new_info; #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp26_, _tmp27_, _tmp28_); -#line 7025 "LibraryMonitor.c" +#line 6859 "LibraryMonitor.c" } static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GFile* file) { LibraryMonitor * self; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_ = FALSE; - GFile* _tmp19_ = NULL; + gboolean _tmp17_; + GFile* _tmp19_; #line 916 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 916 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7043,27 +6877,27 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7046 "LibraryMonitor.c" - GFile* _tmp2_ = NULL; +#line 6880 "LibraryMonitor.c" + GFile* _tmp2_; #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); #line 920 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7054 "LibraryMonitor.c" +#line 6888 "LibraryMonitor.c" } #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7058 "LibraryMonitor.c" +#line 6892 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; + GeeList* _tmp3_; + GeeList* _tmp4_; gint _monitor_size = 0; - GeeList* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; gint _monitor_index = 0; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = self->priv->monitors; @@ -7083,17 +6917,17 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF _monitor_index = -1; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7086 "LibraryMonitor.c" - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 6920 "LibraryMonitor.c" + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gpointer _tmp13_ = NULL; - MediaMonitor* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + MediaMonitor* _tmp14_; + GFile* _tmp15_; + gboolean _tmp16_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7106,7 +6940,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF if (!(_tmp9_ < _tmp10_)) { #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7109 "LibraryMonitor.c" +#line 6943 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7130,43 +6964,43 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7133 "LibraryMonitor.c" +#line 6967 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7137 "LibraryMonitor.c" +#line 6971 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7141 "LibraryMonitor.c" +#line 6975 "LibraryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = known; #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp17_) { -#line 7147 "LibraryMonitor.c" - GFile* _tmp18_ = NULL; +#line 6981 "LibraryMonitor.c" + GFile* _tmp18_; #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = file; #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 7153 "LibraryMonitor.c" +#line 6987 "LibraryMonitor.c" } #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = file; #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_); -#line 7159 "LibraryMonitor.c" +#line 6993 "LibraryMonitor.c" } static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, GFile* file) { LibraryMonitor * self; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_ = FALSE; - GFile* _tmp19_ = NULL; + gboolean _tmp17_; + GFile* _tmp19_; #line 938 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 938 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7177,27 +7011,27 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7180 "LibraryMonitor.c" - GFile* _tmp2_ = NULL; +#line 7014 "LibraryMonitor.c" + GFile* _tmp2_; #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); #line 942 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7188 "LibraryMonitor.c" +#line 7022 "LibraryMonitor.c" } #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7192 "LibraryMonitor.c" +#line 7026 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; + GeeList* _tmp3_; + GeeList* _tmp4_; gint _monitor_size = 0; - GeeList* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; gint _monitor_index = 0; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = self->priv->monitors; @@ -7217,17 +7051,17 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito _monitor_index = -1; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7220 "LibraryMonitor.c" - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 7054 "LibraryMonitor.c" + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gpointer _tmp13_ = NULL; - MediaMonitor* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + MediaMonitor* _tmp14_; + GFile* _tmp15_; + gboolean _tmp16_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7240,7 +7074,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito if (!(_tmp9_ < _tmp10_)) { #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7243 "LibraryMonitor.c" +#line 7077 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7264,44 +7098,44 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito _g_object_unref0 (monitor); #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7267 "LibraryMonitor.c" +#line 7101 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7271 "LibraryMonitor.c" +#line 7105 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7275 "LibraryMonitor.c" +#line 7109 "LibraryMonitor.c" } #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = known; #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp17_) { -#line 7281 "LibraryMonitor.c" - GFile* _tmp18_ = NULL; +#line 7115 "LibraryMonitor.c" + GFile* _tmp18_; #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = file; #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 7287 "LibraryMonitor.c" +#line 7121 "LibraryMonitor.c" } #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = file; #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_); -#line 7293 "LibraryMonitor.c" +#line 7127 "LibraryMonitor.c" } static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, GFile* file, GFileInfo* info) { LibraryMonitor * self; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp19_ = FALSE; - GFile* _tmp21_ = NULL; - GFileInfo* _tmp22_ = NULL; + gboolean _tmp19_; + GFile* _tmp21_; + GFileInfo* _tmp22_; #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7314,9 +7148,9 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7317 "LibraryMonitor.c" - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; +#line 7151 "LibraryMonitor.c" + GFile* _tmp2_; + GFileInfo* _tmp3_; #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7325,19 +7159,19 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_); #line 964 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7328 "LibraryMonitor.c" +#line 7162 "LibraryMonitor.c" } #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7332 "LibraryMonitor.c" +#line 7166 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp4_ = NULL; - GeeList* _tmp5_ = NULL; + GeeList* _tmp4_; + GeeList* _tmp5_; gint _monitor_size = 0; - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; gint _monitor_index = 0; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->monitors; @@ -7357,18 +7191,18 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _monitor_index = -1; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7360 "LibraryMonitor.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 7194 "LibraryMonitor.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; MediaMonitor* monitor = NULL; - GeeList* _tmp12_ = NULL; - gint _tmp13_ = 0; - gpointer _tmp14_ = NULL; - MediaMonitor* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - GFileInfo* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; + GeeList* _tmp12_; + gint _tmp13_; + gpointer _tmp14_; + MediaMonitor* _tmp15_; + GFile* _tmp16_; + GFileInfo* _tmp17_; + gboolean _tmp18_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7381,7 +7215,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni if (!(_tmp10_ < _tmp11_)) { #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7384 "LibraryMonitor.c" +#line 7218 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = _monitor_list; @@ -7407,27 +7241,27 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _g_object_unref0 (monitor); #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7410 "LibraryMonitor.c" +#line 7244 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7414 "LibraryMonitor.c" +#line 7248 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7418 "LibraryMonitor.c" +#line 7252 "LibraryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = known; #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp19_) { -#line 7424 "LibraryMonitor.c" - GFile* _tmp20_ = NULL; +#line 7258 "LibraryMonitor.c" + GFile* _tmp20_; #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp20_ = file; #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp20_); -#line 7430 "LibraryMonitor.c" +#line 7264 "LibraryMonitor.c" } #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = file; @@ -7435,17 +7269,17 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni _tmp22_ = info; #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp21_, _tmp22_); -#line 7438 "LibraryMonitor.c" +#line 7272 "LibraryMonitor.c" } static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GFile* file) { LibraryMonitor * self; - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_ = FALSE; - GFile* _tmp28_ = NULL; + gboolean _tmp17_; + GFile* _tmp28_; #line 982 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 982 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7456,27 +7290,27 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _tmp1_ = library_monitor_is_blacklisted (_tmp0_); #line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 7459 "LibraryMonitor.c" - GFile* _tmp2_ = NULL; +#line 7293 "LibraryMonitor.c" + GFile* _tmp2_; #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_); #line 986 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7467 "LibraryMonitor.c" +#line 7301 "LibraryMonitor.c" } #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7471 "LibraryMonitor.c" +#line 7305 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; + GeeList* _tmp3_; + GeeList* _tmp4_; gint _monitor_size = 0; - GeeList* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GeeList* _tmp5_; + gint _tmp6_; + gint _tmp7_; gint _monitor_index = 0; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = self->priv->monitors; @@ -7496,17 +7330,17 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _monitor_index = -1; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7499 "LibraryMonitor.c" - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 7333 "LibraryMonitor.c" + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_ = NULL; - gint _tmp12_ = 0; - gpointer _tmp13_ = NULL; - MediaMonitor* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeList* _tmp11_; + gint _tmp12_; + gpointer _tmp13_; + MediaMonitor* _tmp14_; + GFile* _tmp15_; + gboolean _tmp16_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7519,7 +7353,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF if (!(_tmp9_ < _tmp10_)) { #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7522 "LibraryMonitor.c" +#line 7356 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7543,27 +7377,27 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _g_object_unref0 (monitor); #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7546 "LibraryMonitor.c" +#line 7380 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7550 "LibraryMonitor.c" +#line 7384 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7554 "LibraryMonitor.c" +#line 7388 "LibraryMonitor.c" } #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = known; #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp17_) { -#line 7560 "LibraryMonitor.c" +#line 7394 "LibraryMonitor.c" Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - Tombstone* _tmp20_ = NULL; - Tombstone* _tmp21_ = NULL; - GFile* _tmp27_ = NULL; + TombstoneSourceCollection* _tmp18_; + GFile* _tmp19_; + Tombstone* _tmp20_; + Tombstone* _tmp21_; + GFile* _tmp27_; #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = tombstone_global; #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7576,12 +7410,12 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _tmp21_ = tombstone; #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp21_ != NULL) { -#line 7579 "LibraryMonitor.c" - GFile* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - TombstoneSourceCollection* _tmp25_ = NULL; - Tombstone* _tmp26_ = NULL; +#line 7413 "LibraryMonitor.c" + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + TombstoneSourceCollection* _tmp25_; + Tombstone* _tmp26_; #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp22_ = file; #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7598,7 +7432,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF _tmp26_ = tombstone; #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" tombstone_source_collection_resurrect (_tmp25_, _tmp26_); -#line 7601 "LibraryMonitor.c" +#line 7435 "LibraryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = file; @@ -7606,13 +7440,13 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF library_monitor_remove_queued_import (self, _tmp27_); #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (tombstone); -#line 7609 "LibraryMonitor.c" +#line 7443 "LibraryMonitor.c" } #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = file; #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp28_); -#line 7615 "LibraryMonitor.c" +#line 7449 "LibraryMonitor.c" } @@ -7631,19 +7465,19 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * data1 = closure->data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7634 "LibraryMonitor.c" +#line 7468 "LibraryMonitor.c" } else { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = closure->data; -#line 7640 "LibraryMonitor.c" +#line 7474 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 7646 "LibraryMonitor.c" +#line 7480 "LibraryMonitor.c" } @@ -7662,47 +7496,47 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa data1 = closure->data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7665 "LibraryMonitor.c" +#line 7499 "LibraryMonitor.c" } else { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" data2 = closure->data; -#line 7671 "LibraryMonitor.c" +#line 7505 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2); -#line 7677 "LibraryMonitor.c" +#line 7511 "LibraryMonitor.c" } static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_find_move_completed ((LibraryMonitor*) self, job); -#line 7684 "LibraryMonitor.c" +#line 7518 "LibraryMonitor.c" } static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_find_move_cancelled ((LibraryMonitor*) self, job); -#line 7691 "LibraryMonitor.c" +#line 7525 "LibraryMonitor.c" } static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { LibraryMonitorFindMoveJob* self = NULL; - LibraryMonitor* _tmp0_ = NULL; - LibraryMonitor* _tmp1_ = NULL; - LibraryMonitor* _tmp2_ = NULL; - GCancellable* _tmp3_ = NULL; - LibraryMonitor* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; + LibraryMonitor* _tmp0_; + LibraryMonitor* _tmp1_; + LibraryMonitor* _tmp2_; + GCancellable* _tmp3_; + LibraryMonitor* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (owner), NULL); #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7741,32 +7575,32 @@ static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 7744 "LibraryMonitor.c" +#line 7578 "LibraryMonitor.c" } static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_find_move_job_construct (LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, owner, file, candidates); -#line 7751 "LibraryMonitor.c" +#line 7585 "LibraryMonitor.c" } static gpointer _g_error_copy0 (gpointer self) { #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7758 "LibraryMonitor.c" +#line 7592 "LibraryMonitor.c" } static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { LibraryMonitorFindMoveJob * self; GeeIterator* iter = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; - GeeCollection* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; + GeeCollection* _tmp12_; + gint _tmp13_; + gint _tmp14_; gchar* md5 = NULL; GError * _inner_error_ = NULL; #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7779,16 +7613,16 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { iter = _tmp1_; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7782 "LibraryMonitor.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - Monitorable* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; +#line 7616 "LibraryMonitor.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; + GeeIterator* _tmp4_; + gpointer _tmp5_; + Monitorable* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = iter; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7797,7 +7631,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { if (!_tmp3_) { #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7800 "LibraryMonitor.c" +#line 7634 "LibraryMonitor.c" } #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = iter; @@ -7819,13 +7653,13 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (_tmp6_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp10_) { -#line 7822 "LibraryMonitor.c" - GeeIterator* _tmp11_ = NULL; +#line 7656 "LibraryMonitor.c" + GeeIterator* _tmp11_; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = iter; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_iterator_remove (_tmp11_); -#line 7828 "LibraryMonitor.c" +#line 7662 "LibraryMonitor.c" } } #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7840,16 +7674,16 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (iter); #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7843 "LibraryMonitor.c" +#line 7677 "LibraryMonitor.c" } #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 7847 "LibraryMonitor.c" +#line 7681 "LibraryMonitor.c" { gchar* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; + GFile* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = self->file; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7858,8 +7692,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _tmp15_ = _tmp17_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7861 "LibraryMonitor.c" - goto __catch491_g_error; +#line 7695 "LibraryMonitor.c" + goto __catch492_g_error; } #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = _tmp15_; @@ -7871,14 +7705,14 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { md5 = _tmp18_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp15_); -#line 7874 "LibraryMonitor.c" +#line 7708 "LibraryMonitor.c" } - goto __finally491; - __catch491_g_error: + goto __finally492; + __catch492_g_error: { GError* err = NULL; - GError* _tmp19_ = NULL; - GError* _tmp20_ = NULL; + GError* _tmp19_; + GError* _tmp20_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7899,9 +7733,9 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (iter); #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7902 "LibraryMonitor.c" +#line 7736 "LibraryMonitor.c" } - __finally491: + __finally492: #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7914,12 +7748,12 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { g_clear_error (&_inner_error_); #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7917 "LibraryMonitor.c" +#line 7751 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp21_ = NULL; - GeeIterator* _tmp22_ = NULL; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = self->candidates; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7928,20 +7762,20 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _candidate_it = _tmp22_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7931 "LibraryMonitor.c" - GeeIterator* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; +#line 7765 "LibraryMonitor.c" + GeeIterator* _tmp23_; + gboolean _tmp24_; Monitorable* candidate = NULL; - GeeIterator* _tmp25_ = NULL; - gpointer _tmp26_ = NULL; - Monitorable* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; - Monitorable* _tmp32_ = NULL; - Monitorable* _tmp46_ = NULL; - Monitorable* _tmp47_ = NULL; + GeeIterator* _tmp25_; + gpointer _tmp26_; + Monitorable* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + const gchar* _tmp30_; + gboolean _tmp31_; + Monitorable* _tmp32_; + Monitorable* _tmp46_; + Monitorable* _tmp47_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp23_ = _candidate_it; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7950,7 +7784,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { if (!_tmp24_) { #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7953 "LibraryMonitor.c" +#line 7787 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = _candidate_it; @@ -7976,25 +7810,25 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (candidate); #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 7979 "LibraryMonitor.c" +#line 7813 "LibraryMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp32_ = self->match; #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp32_ != NULL) { -#line 7985 "LibraryMonitor.c" - GFile* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - Monitorable* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - Monitorable* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - GeeArrayList* _tmp42_ = NULL; - GeeArrayList* _tmp44_ = NULL; - Monitorable* _tmp45_ = NULL; +#line 7819 "LibraryMonitor.c" + GFile* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + Monitorable* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + Monitorable* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + GeeArrayList* _tmp42_; + GeeArrayList* _tmp44_; + Monitorable* _tmp45_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp33_ = self->file; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8026,15 +7860,15 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _tmp42_ = self->losers; #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp42_ == NULL) { -#line 8028 "LibraryMonitor.c" - GeeArrayList* _tmp43_ = NULL; +#line 7862 "LibraryMonitor.c" + GeeArrayList* _tmp43_; #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->losers); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->losers = _tmp43_; -#line 8036 "LibraryMonitor.c" +#line 7870 "LibraryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp44_ = self->losers; @@ -8046,7 +7880,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (candidate); #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 8048 "LibraryMonitor.c" +#line 7882 "LibraryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp46_ = candidate; @@ -8058,17 +7892,17 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { self->match = _tmp47_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8060 "LibraryMonitor.c" +#line 7894 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8064 "LibraryMonitor.c" +#line 7898 "LibraryMonitor.c" } #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (iter); -#line 8070 "LibraryMonitor.c" +#line 7904 "LibraryMonitor.c" } @@ -8078,8 +7912,8 @@ static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobC #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->finalize = library_monitor_find_move_job_finalize; #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_find_move_job_real_execute; -#line 8081 "LibraryMonitor.c" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_find_move_job_real_execute; +#line 7915 "LibraryMonitor.c" } @@ -8090,11 +7924,11 @@ static void library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJ self->losers = NULL; #line 108 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 8092 "LibraryMonitor.c" +#line 7926 "LibraryMonitor.c" } -static void library_monitor_find_move_job_finalize (BackgroundJob* obj) { +static void library_monitor_find_move_job_finalize (BackgroundJob * obj) { LibraryMonitorFindMoveJob * self; #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob); @@ -8110,7 +7944,7 @@ static void library_monitor_find_move_job_finalize (BackgroundJob* obj) { _g_error_free0 (self->err); #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" BACKGROUND_JOB_CLASS (library_monitor_find_move_job_parent_class)->finalize (obj); -#line 8112 "LibraryMonitor.c" +#line 7946 "LibraryMonitor.c" } @@ -8129,20 +7963,20 @@ static GType library_monitor_find_move_job_get_type (void) { static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_on_runtime_find_move_completed ((LibraryMonitor*) self, job); -#line 8131 "LibraryMonitor.c" +#line 7965 "LibraryMonitor.c" } static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { LibraryMonitorRuntimeFindMoveJob* self = NULL; - LibraryMonitor* _tmp0_ = NULL; - LibraryMonitor* _tmp1_ = NULL; - LibraryMonitor* _tmp2_ = NULL; - GCancellable* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; + LibraryMonitor* _tmp0_; + LibraryMonitor* _tmp1_; + LibraryMonitor* _tmp2_; + GCancellable* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_LIBRARY_MONITOR (owner), NULL); #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8179,14 +8013,14 @@ static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_c background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW); #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8181 "LibraryMonitor.c" +#line 8015 "LibraryMonitor.c" } static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_runtime_find_move_job_construct (LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, owner, file, candidates); -#line 8188 "LibraryMonitor.c" +#line 8022 "LibraryMonitor.c" } @@ -8198,12 +8032,12 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob); #line 177 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 8200 "LibraryMonitor.c" +#line 8034 "LibraryMonitor.c" { gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->file; #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8212,8 +8046,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _tmp0_ = _tmp2_; #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8214 "LibraryMonitor.c" - goto __catch492_g_error; +#line 8048 "LibraryMonitor.c" + goto __catch493_g_error; } #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = _tmp0_; @@ -8225,14 +8059,14 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b md5 = _tmp3_; #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp0_); -#line 8227 "LibraryMonitor.c" +#line 8061 "LibraryMonitor.c" } - goto __finally492; - __catch492_g_error: + goto __finally493; + __catch493_g_error: { GError* err = NULL; - GError* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + GError* _tmp4_; + GError* _tmp5_; #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8251,9 +8085,9 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_free0 (md5); #line 183 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 8253 "LibraryMonitor.c" +#line 8087 "LibraryMonitor.c" } - __finally492: + __finally493: #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8264,12 +8098,12 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 8266 "LibraryMonitor.c" +#line 8100 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = self->candidates; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8278,17 +8112,17 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _candidate_it = _tmp7_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 8280 "LibraryMonitor.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 8114 "LibraryMonitor.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; Monitorable* candidate = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - Monitorable* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeIterator* _tmp10_; + gpointer _tmp11_; + Monitorable* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; + gboolean _tmp16_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _candidate_it; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8297,7 +8131,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b if (!_tmp9_) { #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8299 "LibraryMonitor.c" +#line 8133 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = _candidate_it; @@ -8319,9 +8153,9 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_free0 (_tmp14_); #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp16_) { -#line 8321 "LibraryMonitor.c" - Monitorable* _tmp17_ = NULL; - Monitorable* _tmp18_ = NULL; +#line 8155 "LibraryMonitor.c" + Monitorable* _tmp17_; + Monitorable* _tmp18_; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = candidate; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8334,19 +8168,19 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b _g_object_unref0 (candidate); #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8336 "LibraryMonitor.c" +#line 8170 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8340 "LibraryMonitor.c" +#line 8174 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8344 "LibraryMonitor.c" +#line 8178 "LibraryMonitor.c" } #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); -#line 8348 "LibraryMonitor.c" +#line 8182 "LibraryMonitor.c" } @@ -8356,8 +8190,8 @@ static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRunt #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((BackgroundJobClass *) klass)->finalize = library_monitor_runtime_find_move_job_finalize; #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_runtime_find_move_job_real_execute; -#line 8359 "LibraryMonitor.c" + ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_runtime_find_move_job_real_execute; +#line 8193 "LibraryMonitor.c" } @@ -8366,11 +8200,11 @@ static void library_monitor_runtime_find_move_job_instance_init (LibraryMonitorR self->match = NULL; #line 165 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 8368 "LibraryMonitor.c" +#line 8202 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj) { +static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj) { LibraryMonitorRuntimeFindMoveJob * self; #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob); @@ -8384,7 +8218,7 @@ static void library_monitor_runtime_find_move_job_finalize (BackgroundJob* obj) _g_error_free0 (self->err); #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" BACKGROUND_JOB_CLASS (library_monitor_runtime_find_move_job_parent_class)->finalize (obj); -#line 8386 "LibraryMonitor.c" +#line 8220 "LibraryMonitor.c" } @@ -8402,10 +8236,10 @@ static GType library_monitor_runtime_find_move_job_get_type (void) { static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, Monitorable* monitorable, MediaMonitor* monitor) { LibraryMonitorVerifyJob* self = NULL; - Monitorable* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; - MediaMonitor* _tmp2_ = NULL; - MediaMonitor* _tmp3_ = NULL; + Monitorable* _tmp0_; + Monitorable* _tmp1_; + MediaMonitor* _tmp2_; + MediaMonitor* _tmp3_; #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8430,21 +8264,21 @@ static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType obje self->monitor = _tmp3_; #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8432 "LibraryMonitor.c" +#line 8266 "LibraryMonitor.c" } static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor) { #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return library_monitor_verify_job_construct (LIBRARY_MONITOR_TYPE_VERIFY_JOB, monitorable, monitor); -#line 8439 "LibraryMonitor.c" +#line 8273 "LibraryMonitor.c" } static void library_monitor_value_verify_job_init (GValue* value) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8446 "LibraryMonitor.c" +#line 8280 "LibraryMonitor.c" } @@ -8453,7 +8287,7 @@ static void library_monitor_value_verify_job_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (value->data[0].v_pointer); -#line 8455 "LibraryMonitor.c" +#line 8289 "LibraryMonitor.c" } } @@ -8463,11 +8297,11 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = library_monitor_verify_job_ref (src_value->data[0].v_pointer); -#line 8465 "LibraryMonitor.c" +#line 8299 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 8469 "LibraryMonitor.c" +#line 8303 "LibraryMonitor.c" } } @@ -8475,66 +8309,66 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value static gpointer library_monitor_value_verify_job_peek_pointer (const GValue* value) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 8477 "LibraryMonitor.c" +#line 8311 "LibraryMonitor.c" } static gchar* library_monitor_value_verify_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (collect_values[0].v_pointer) { -#line 8484 "LibraryMonitor.c" - LibraryMonitorVerifyJob* object; +#line 8318 "LibraryMonitor.c" + LibraryMonitorVerifyJob * object; object = collect_values[0].v_pointer; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8491 "LibraryMonitor.c" +#line 8325 "LibraryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8495 "LibraryMonitor.c" +#line 8329 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_verify_job_ref (object); -#line 8499 "LibraryMonitor.c" +#line 8333 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8503 "LibraryMonitor.c" +#line 8337 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8507 "LibraryMonitor.c" +#line 8341 "LibraryMonitor.c" } static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - LibraryMonitorVerifyJob** object_p; + LibraryMonitorVerifyJob ** object_p; object_p = collect_values[0].v_pointer; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!object_p) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8518 "LibraryMonitor.c" +#line 8352 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!value->data[0].v_pointer) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = NULL; -#line 8524 "LibraryMonitor.c" +#line 8358 "LibraryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 8528 "LibraryMonitor.c" +#line 8362 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_verify_job_ref (value->data[0].v_pointer); -#line 8532 "LibraryMonitor.c" +#line 8366 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8536 "LibraryMonitor.c" +#line 8370 "LibraryMonitor.c" } @@ -8548,7 +8382,7 @@ static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return G_PARAM_SPEC (spec); -#line 8550 "LibraryMonitor.c" +#line 8384 "LibraryMonitor.c" } @@ -8557,12 +8391,12 @@ static gpointer library_monitor_value_get_verify_job (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return value->data[0].v_pointer; -#line 8559 "LibraryMonitor.c" +#line 8393 "LibraryMonitor.c" } static void library_monitor_value_set_verify_job (GValue* value, gpointer v_object) { - LibraryMonitorVerifyJob* old; + LibraryMonitorVerifyJob * old; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB)); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8577,23 +8411,23 @@ static void library_monitor_value_set_verify_job (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_ref (value->data[0].v_pointer); -#line 8579 "LibraryMonitor.c" +#line 8413 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8583 "LibraryMonitor.c" +#line 8417 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (old); -#line 8589 "LibraryMonitor.c" +#line 8423 "LibraryMonitor.c" } } static void library_monitor_value_take_verify_job (GValue* value, gpointer v_object) { - LibraryMonitorVerifyJob* old; + LibraryMonitorVerifyJob * old; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB)); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8606,17 +8440,17 @@ static void library_monitor_value_take_verify_job (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = v_object; -#line 8608 "LibraryMonitor.c" +#line 8442 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8612 "LibraryMonitor.c" +#line 8446 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (old) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_job_unref (old); -#line 8618 "LibraryMonitor.c" +#line 8452 "LibraryMonitor.c" } } @@ -8626,18 +8460,18 @@ static void library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass library_monitor_verify_job_parent_class = g_type_class_peek_parent (klass); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ((LibraryMonitorVerifyJobClass *) klass)->finalize = library_monitor_verify_job_finalize; -#line 8628 "LibraryMonitor.c" +#line 8462 "LibraryMonitor.c" } static void library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->ref_count = 1; -#line 8635 "LibraryMonitor.c" +#line 8469 "LibraryMonitor.c" } -static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj) { +static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj) { LibraryMonitorVerifyJob * self; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_MONITOR_TYPE_VERIFY_JOB, LibraryMonitorVerifyJob); @@ -8647,7 +8481,7 @@ static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob* obj) { _g_object_unref0 (self->monitorable); #line 198 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitor); -#line 8649 "LibraryMonitor.c" +#line 8483 "LibraryMonitor.c" } @@ -8666,18 +8500,18 @@ static GType library_monitor_verify_job_get_type (void) { static gpointer library_monitor_verify_job_ref (gpointer instance) { - LibraryMonitorVerifyJob* self; + LibraryMonitorVerifyJob * self; self = instance; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 8674 "LibraryMonitor.c" +#line 8508 "LibraryMonitor.c" } static void library_monitor_verify_job_unref (gpointer instance) { - LibraryMonitorVerifyJob* self; + LibraryMonitorVerifyJob * self; self = instance; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8685,46 +8519,46 @@ static void library_monitor_verify_job_unref (gpointer instance) { LIBRARY_MONITOR_VERIFY_JOB_GET_CLASS (self)->finalize (self); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8687 "LibraryMonitor.c" +#line 8521 "LibraryMonitor.c" } } static void library_monitor_class_init (LibraryMonitorClass * klass) { - GeeHashSet* _tmp0_ = NULL; - HashTimedQueue* _tmp1_ = NULL; + GeeHashSet* _tmp0_; + HashTimedQueue* _tmp1_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_parent_class = g_type_class_peek_parent (klass); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_type_class_add_private (klass, sizeof (LibraryMonitorPrivate)); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->close = (void (*)(DirectoryMonitor*)) library_monitor_real_close; + ((DirectoryMonitorClass *) klass)->close = (void (*) (DirectoryMonitor *)) library_monitor_real_close; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->discovery_started = (void (*)(DirectoryMonitor*)) library_monitor_real_discovery_started; + ((DirectoryMonitorClass *) klass)->discovery_started = (void (*) (DirectoryMonitor *)) library_monitor_real_discovery_started; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_file_discovered; + ((DirectoryMonitorClass *) klass)->file_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) library_monitor_real_file_discovered; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->discovery_completed = (void (*)(DirectoryMonitor*)) library_monitor_real_discovery_completed; + ((DirectoryMonitorClass *) klass)->discovery_completed = (void (*) (DirectoryMonitor *)) library_monitor_real_discovery_completed; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_notify_file_created; + ((DirectoryMonitorClass *) klass)->notify_file_created = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) library_monitor_real_notify_file_created; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) library_monitor_real_notify_file_moved; + ((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) library_monitor_real_notify_file_moved; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_altered; + ((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*) (DirectoryMonitor *, GFile*)) library_monitor_real_notify_file_altered; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_attributes_altered; + ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*) (DirectoryMonitor *, GFile*)) library_monitor_real_notify_file_attributes_altered; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) library_monitor_real_notify_file_alteration_completed; + ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) library_monitor_real_notify_file_alteration_completed; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*)(DirectoryMonitor*, GFile*)) library_monitor_real_notify_file_deleted; + ((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*) (DirectoryMonitor *, GFile*)) library_monitor_real_notify_file_deleted; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" G_OBJECT_CLASS (klass)->finalize = library_monitor_finalize; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_new ("auto_update_progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); + library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL] = g_signal_new ("auto-update-progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_new ("auto_import_preparing", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL] = g_signal_new ("auto-import-preparing", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_new ("auto_import_progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); + library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL] = g_signal_new ("auto-import-progress", TYPE_LIBRARY_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_init (&__lock_library_monitor_blacklist); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8735,19 +8569,19 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) { _tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, (guint) LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC, _library_monitor_on_unblacklist_file_dequeued_callback, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, G_PRIORITY_LOW); #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_to_unblacklist = _tmp1_; -#line 8737 "LibraryMonitor.c" +#line 8571 "LibraryMonitor.c" } static void library_monitor_instance_init (LibraryMonitor * self) { - guint _tmp0_ = 0U; - Workers* _tmp1_ = NULL; - GCancellable* _tmp2_ = NULL; - GeeArrayList* _tmp3_ = NULL; - GeeHashSet* _tmp4_ = NULL; - GeeHashSet* _tmp5_ = NULL; - GeeArrayList* _tmp6_ = NULL; - GeeLinkedList* _tmp7_ = NULL; + guint _tmp0_; + Workers* _tmp1_; + GCancellable* _tmp2_; + GeeArrayList* _tmp3_; + GeeHashSet* _tmp4_; + GeeHashSet* _tmp5_; + GeeArrayList* _tmp6_; + GeeLinkedList* _tmp7_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv = LIBRARY_MONITOR_GET_PRIVATE (self); #line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8804,15 +8638,15 @@ static void library_monitor_instance_init (LibraryMonitor * self) { self->priv->completed_monitorable_verifies = 0; #line 228 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->total_monitorable_verifies = 0; -#line 8806 "LibraryMonitor.c" +#line 8640 "LibraryMonitor.c" } -static void library_monitor_finalize (GObject* obj) { +static void library_monitor_finalize (GObject * obj) { LibraryMonitor * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - guint _tmp2_ = 0U; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + guint _tmp2_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_MONITOR, LibraryMonitor); #line 247 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8849,7 +8683,7 @@ static void library_monitor_finalize (GObject* obj) { _g_object_unref0 (self->priv->verify_queue); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" G_OBJECT_CLASS (library_monitor_parent_class)->finalize (obj); -#line 8851 "LibraryMonitor.c" +#line 8685 "LibraryMonitor.c" } |