From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/LibraryMonitor.c | 1145 +++++++++++++++++++++++++------------------------- 1 file changed, 573 insertions(+), 572 deletions(-) (limited to 'src/LibraryMonitor.c') diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c index 7cc9ef6..123f726 100644 --- a/src/LibraryMonitor.c +++ b/src/LibraryMonitor.c @@ -813,6 +813,7 @@ struct _ImportManifest { GeeList* already_imported; GeeList* corrupt_files; GeeList* all; + GTimer* timer; }; struct _ImportManifestClass { @@ -1084,7 +1085,7 @@ static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *sou 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_add131 (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 @@ -1110,8 +1111,8 @@ void value_set_batch_import_job (GValue* value, gpointer v_object); void value_take_batch_import_job (GValue* value, gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library); -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library); +FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); +FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); GType file_import_job_get_type (void) G_GNUC_CONST; gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); @@ -1233,14 +1234,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 1237 "LibraryMonitor.c" +#line 1238 "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 1244 "LibraryMonitor.c" +#line 1245 "LibraryMonitor.c" } @@ -1254,26 +1255,26 @@ void library_monitor_pool_terminate (void) { _tmp0_ = library_monitor_pool_instance; #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ != NULL) { -#line 1258 "LibraryMonitor.c" +#line 1259 "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 1264 "LibraryMonitor.c" +#line 1265 "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 1270 "LibraryMonitor.c" +#line 1271 "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 1277 "LibraryMonitor.c" +#line 1278 "LibraryMonitor.c" } @@ -1286,7 +1287,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { _tmp0_ = library_monitor_pool_instance; #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ == NULL) { -#line 1290 "LibraryMonitor.c" +#line 1291 "LibraryMonitor.c" LibraryMonitorPool* _tmp1_; #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_pool_new (); @@ -1294,7 +1295,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { _library_monitor_pool_unref0 (library_monitor_pool_instance); #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_instance = _tmp1_; -#line 1298 "LibraryMonitor.c" +#line 1299 "LibraryMonitor.c" } #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = library_monitor_pool_instance; @@ -1304,14 +1305,14 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { result = _tmp3_; #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1308 "LibraryMonitor.c" +#line 1309 "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 1315 "LibraryMonitor.c" +#line 1316 "LibraryMonitor.c" } @@ -1329,7 +1330,7 @@ LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { result = _tmp1_; #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1333 "LibraryMonitor.c" +#line 1334 "LibraryMonitor.c" } @@ -1338,7 +1339,7 @@ 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 1342 "LibraryMonitor.c" +#line 1343 "LibraryMonitor.c" } @@ -1366,21 +1367,21 @@ 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 1370 "LibraryMonitor.c" +#line 1371 "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 1376 "LibraryMonitor.c" +#line 1377 "LibraryMonitor.c" } else { #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = FALSE; -#line 1380 "LibraryMonitor.c" +#line 1381 "LibraryMonitor.c" } #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp2_) { -#line 1384 "LibraryMonitor.c" +#line 1385 "LibraryMonitor.c" gint _tmp5_; guint _tmp6_; #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1389,13 +1390,13 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep _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 1393 "LibraryMonitor.c" +#line 1394 "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 (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp7_); -#line 1399 "LibraryMonitor.c" +#line 1400 "LibraryMonitor.c" } @@ -1414,7 +1415,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { if (_tmp0_ == NULL) { #line 75 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 1418 "LibraryMonitor.c" +#line 1419 "LibraryMonitor.c" } #line 77 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1436,7 +1437,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { 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 1440 "LibraryMonitor.c" +#line 1441 "LibraryMonitor.c" } @@ -1456,7 +1457,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 1460 "LibraryMonitor.c" +#line 1461 "LibraryMonitor.c" } #line 91 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1466,14 +1467,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 1470 "LibraryMonitor.c" +#line 1471 "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 1477 "LibraryMonitor.c" +#line 1478 "LibraryMonitor.c" } @@ -1482,7 +1483,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 1486 "LibraryMonitor.c" +#line 1487 "LibraryMonitor.c" } } @@ -1492,11 +1493,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 1496 "LibraryMonitor.c" +#line 1497 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 1500 "LibraryMonitor.c" +#line 1501 "LibraryMonitor.c" } } @@ -1504,37 +1505,37 @@ 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 1508 "LibraryMonitor.c" +#line 1509 "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 1515 "LibraryMonitor.c" +#line 1516 "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 1522 "LibraryMonitor.c" +#line 1523 "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 1526 "LibraryMonitor.c" +#line 1527 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_pool_ref (object); -#line 1530 "LibraryMonitor.c" +#line 1531 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1534 "LibraryMonitor.c" +#line 1535 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1538 "LibraryMonitor.c" +#line 1539 "LibraryMonitor.c" } @@ -1545,25 +1546,25 @@ static gchar* value_library_monitor_pool_lcopy_value (const GValue* value, guint 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 1549 "LibraryMonitor.c" +#line 1550 "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 1555 "LibraryMonitor.c" +#line 1556 "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 1559 "LibraryMonitor.c" +#line 1560 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_pool_ref (value->data[0].v_pointer); -#line 1563 "LibraryMonitor.c" +#line 1564 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1567 "LibraryMonitor.c" +#line 1568 "LibraryMonitor.c" } @@ -1577,7 +1578,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 1581 "LibraryMonitor.c" +#line 1582 "LibraryMonitor.c" } @@ -1586,7 +1587,7 @@ 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 1590 "LibraryMonitor.c" +#line 1591 "LibraryMonitor.c" } @@ -1606,17 +1607,17 @@ 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 1610 "LibraryMonitor.c" +#line 1611 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1614 "LibraryMonitor.c" +#line 1615 "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 1620 "LibraryMonitor.c" +#line 1621 "LibraryMonitor.c" } } @@ -1635,17 +1636,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 1639 "LibraryMonitor.c" +#line 1640 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1643 "LibraryMonitor.c" +#line 1644 "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 1649 "LibraryMonitor.c" +#line 1650 "LibraryMonitor.c" } } @@ -1661,7 +1662,7 @@ static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) { 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" 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" +#line 1666 "LibraryMonitor.c" } @@ -1674,7 +1675,7 @@ 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 1678 "LibraryMonitor.c" +#line 1679 "LibraryMonitor.c" } @@ -1686,7 +1687,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 1690 "LibraryMonitor.c" +#line 1691 "LibraryMonitor.c" } @@ -1711,7 +1712,7 @@ gpointer library_monitor_pool_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 1715 "LibraryMonitor.c" +#line 1716 "LibraryMonitor.c" } @@ -1724,7 +1725,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 1728 "LibraryMonitor.c" +#line 1729 "LibraryMonitor.c" } } @@ -1732,7 +1733,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 1736 "LibraryMonitor.c" +#line 1737 "LibraryMonitor.c" } @@ -1741,7 +1742,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 1745 "LibraryMonitor.c" +#line 1746 "LibraryMonitor.c" } @@ -1750,14 +1751,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 1754 "LibraryMonitor.c" +#line 1755 "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 1761 "LibraryMonitor.c" +#line 1762 "LibraryMonitor.c" } @@ -1766,7 +1767,7 @@ 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 1770 "LibraryMonitor.c" +#line 1771 "LibraryMonitor.c" } @@ -1815,14 +1816,14 @@ 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 1819 "LibraryMonitor.c" +#line 1820 "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 1826 "LibraryMonitor.c" +#line 1827 "LibraryMonitor.c" } @@ -1836,7 +1837,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _tmp0_ = self->priv->cancellable; #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 1840 "LibraryMonitor.c" +#line 1841 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp1_; @@ -1864,7 +1865,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _monitor_index = -1; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 1868 "LibraryMonitor.c" +#line 1869 "LibraryMonitor.c" gint _tmp6_; gint _tmp7_; gint _tmp8_; @@ -1885,7 +1886,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { if (!(_tmp7_ < _tmp8_)) { #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 1889 "LibraryMonitor.c" +#line 1890 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = _monitor_list; @@ -1901,17 +1902,17 @@ 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 1905 "LibraryMonitor.c" +#line 1906 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 1909 "LibraryMonitor.c" +#line 1910 "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 1915 "LibraryMonitor.c" +#line 1916 "LibraryMonitor.c" guint _tmp14_; #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = self->priv->import_queue_timer_id; @@ -1919,11 +1920,11 @@ static void library_monitor_real_close (DirectoryMonitor* base) { g_source_remove (_tmp14_); #line 258 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; -#line 1923 "LibraryMonitor.c" +#line 1924 "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 1927 "LibraryMonitor.c" +#line 1928 "LibraryMonitor.c" } @@ -1950,7 +1951,7 @@ 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 1954 "LibraryMonitor.c" +#line 1955 "LibraryMonitor.c" GeeHashMap* _tmp3_; MediaMonitor* _tmp4_; GeeHashSet* _tmp5_; @@ -1967,7 +1968,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 1971 "LibraryMonitor.c" +#line 1972 "LibraryMonitor.c" } #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = self->priv->discovered; @@ -1983,7 +1984,7 @@ 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 1987 "LibraryMonitor.c" +#line 1988 "LibraryMonitor.c" } @@ -1996,7 +1997,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor 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 2000 "LibraryMonitor.c" +#line 2001 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -2024,7 +2025,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor _monitor_index = -1; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2028 "LibraryMonitor.c" +#line 2029 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -2050,7 +2051,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor if (!(_tmp6_ < _tmp7_)) { #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2054 "LibraryMonitor.c" +#line 2055 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2082,15 +2083,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 2086 "LibraryMonitor.c" +#line 2087 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2090 "LibraryMonitor.c" +#line 2091 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2094 "LibraryMonitor.c" +#line 2095 "LibraryMonitor.c" } #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = monitorable; @@ -2102,7 +2103,7 @@ 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 2106 "LibraryMonitor.c" +#line 2107 "LibraryMonitor.c" } @@ -2112,7 +2113,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { GeeHashSet* _tmp29_; #line 280 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); -#line 2116 "LibraryMonitor.c" +#line 2117 "LibraryMonitor.c" { GeeIterator* _collection_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -2141,7 +2142,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _collection_it = _tmp5_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2145 "LibraryMonitor.c" +#line 2146 "LibraryMonitor.c" GeeIterator* _tmp6_; gboolean _tmp7_; MediaSourceCollection* collection = NULL; @@ -2161,7 +2162,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { if (!_tmp7_) { #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2165 "LibraryMonitor.c" +#line 2166 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _collection_it; @@ -2187,11 +2188,11 @@ 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 2191 "LibraryMonitor.c" +#line 2192 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_collection_it); -#line 2195 "LibraryMonitor.c" +#line 2196 "LibraryMonitor.c" } { GeeList* _monitor_list = NULL; @@ -2220,7 +2221,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _monitor_index = -1; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2224 "LibraryMonitor.c" +#line 2225 "LibraryMonitor.c" gint _tmp21_; gint _tmp22_; gint _tmp23_; @@ -2241,7 +2242,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { if (!(_tmp22_ < _tmp23_)) { #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2245 "LibraryMonitor.c" +#line 2246 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp24_ = _monitor_list; @@ -2257,11 +2258,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 2261 "LibraryMonitor.c" +#line 2262 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2265 "LibraryMonitor.c" +#line 2266 "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); @@ -2277,7 +2278,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 2281 "LibraryMonitor.c" +#line 2282 "LibraryMonitor.c" } @@ -2301,7 +2302,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* representing = NULL; #line 296 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ignore = FALSE; -#line 2305 "LibraryMonitor.c" +#line 2306 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -2329,7 +2330,7 @@ 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 2333 "LibraryMonitor.c" +#line 2334 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -2356,7 +2357,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 2360 "LibraryMonitor.c" +#line 2361 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2384,7 +2385,7 @@ 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 2388 "LibraryMonitor.c" +#line 2389 "LibraryMonitor.c" MediaMonitor* _tmp17_; MediaMonitor* _tmp18_; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2399,7 +2400,7 @@ 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 2403 "LibraryMonitor.c" +#line 2404 "LibraryMonitor.c" } else { MediaMonitorDiscoveredFile _tmp19_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2412,22 +2413,22 @@ 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 2416 "LibraryMonitor.c" +#line 2417 "LibraryMonitor.c" } } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2421 "LibraryMonitor.c" +#line 2422 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2425 "LibraryMonitor.c" +#line 2426 "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 2431 "LibraryMonitor.c" +#line 2432 "LibraryMonitor.c" gboolean _tmp21_ = FALSE; Monitorable* _tmp22_; MediaMonitor* _tmp24_; @@ -2436,17 +2437,17 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _tmp22_ = representation; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp22_ != NULL) { -#line 2440 "LibraryMonitor.c" +#line 2441 "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 2446 "LibraryMonitor.c" +#line 2447 "LibraryMonitor.c" } else { #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = FALSE; -#line 2450 "LibraryMonitor.c" +#line 2451 "LibraryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _vala_assert (_tmp21_, "representation != null && !ignore"); @@ -2456,7 +2457,7 @@ 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 2460 "LibraryMonitor.c" +#line 2461 "LibraryMonitor.c" } else { gboolean _tmp26_ = FALSE; gboolean _tmp27_ = FALSE; @@ -2465,7 +2466,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _tmp28_ = ignore; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (!_tmp28_) { -#line 2469 "LibraryMonitor.c" +#line 2470 "LibraryMonitor.c" TombstoneSourceCollection* _tmp29_; GFile* _tmp30_; gboolean _tmp31_; @@ -2477,15 +2478,15 @@ 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 2481 "LibraryMonitor.c" +#line 2482 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = FALSE; -#line 2485 "LibraryMonitor.c" +#line 2486 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp27_) { -#line 2489 "LibraryMonitor.c" +#line 2490 "LibraryMonitor.c" GFile* _tmp32_; gboolean _tmp33_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2494,15 +2495,15 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _tmp33_ = library_monitor_is_supported_filetype (self, _tmp32_); #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = _tmp33_; -#line 2498 "LibraryMonitor.c" +#line 2499 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = FALSE; -#line 2502 "LibraryMonitor.c" +#line 2503 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp26_) { -#line 2506 "LibraryMonitor.c" +#line 2507 "LibraryMonitor.c" GeeHashSet* _tmp34_; GFile* _tmp35_; #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2511,7 +2512,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* _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 2515 "LibraryMonitor.c" +#line 2516 "LibraryMonitor.c" } } #line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2524,7 +2525,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 2528 "LibraryMonitor.c" +#line 2529 "LibraryMonitor.c" } @@ -2534,7 +2535,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 2538 "LibraryMonitor.c" +#line 2539 "LibraryMonitor.c" } @@ -2545,7 +2546,7 @@ 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 2549 "LibraryMonitor.c" +#line 2550 "LibraryMonitor.c" } @@ -2557,11 +2558,11 @@ static void library_monitor_async_discovery_completed_async_ready_wrapper (GObje 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 2562 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 2565 "LibraryMonitor.c" +#line 2566 "LibraryMonitor.c" } @@ -2578,7 +2579,7 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 2582 "LibraryMonitor.c" +#line 2583 "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); @@ -2588,7 +2589,7 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs _data_->self = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_async_discovery_completed_co (_data_); -#line 2592 "LibraryMonitor.c" +#line 2593 "LibraryMonitor.c" } @@ -2596,7 +2597,7 @@ static void library_monitor_async_discovery_completed_finish (LibraryMonitor* se LibraryMonitorAsyncDiscoveryCompletedData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 2600 "LibraryMonitor.c" +#line 2601 "LibraryMonitor.c" } @@ -2605,7 +2606,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 2609 "LibraryMonitor.c" +#line 2610 "LibraryMonitor.c" } @@ -2614,16 +2615,16 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn switch (_data_->_state_) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 2618 "LibraryMonitor.c" +#line 2619 "LibraryMonitor.c" goto _state_0; #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 2622 "LibraryMonitor.c" +#line 2623 "LibraryMonitor.c" goto _state_1; default: #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 2627 "LibraryMonitor.c" +#line 2628 "LibraryMonitor.c" } _state_0: #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2644,14 +2645,14 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn while (_data_->_task_complete_ != TRUE) { #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2648 "LibraryMonitor.c" +#line 2649 "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 2655 "LibraryMonitor.c" +#line 2656 "LibraryMonitor.c" } #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); @@ -2661,7 +2662,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _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 2665 "LibraryMonitor.c" +#line 2666 "LibraryMonitor.c" { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp5_ = _data_->self->priv->unknown_files; @@ -2679,7 +2680,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn if (!_data_->_tmp8_) { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2683 "LibraryMonitor.c" +#line 2684 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp9_ = _data_->_file_it; @@ -2703,7 +2704,7 @@ 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 2707 "LibraryMonitor.c" +#line 2708 "LibraryMonitor.c" } #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp14_ = _data_->all_candidates; @@ -2713,7 +2714,7 @@ 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 2717 "LibraryMonitor.c" +#line 2718 "LibraryMonitor.c" { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp15_ = _data_->self->priv->monitors; @@ -2745,7 +2746,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn if (!(_data_->_tmp21_ < _data_->_tmp22_)) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2749 "LibraryMonitor.c" +#line 2750 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp23_ = _data_->_monitor_list; @@ -2777,13 +2778,13 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn if (_data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp31_ = TRUE; -#line 2781 "LibraryMonitor.c" +#line 2782 "LibraryMonitor.c" } else { #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 2787 "LibraryMonitor.c" +#line 2788 "LibraryMonitor.c" } #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp31_) { @@ -2793,7 +2794,7 @@ 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 2797 "LibraryMonitor.c" +#line 2798 "LibraryMonitor.c" } else { #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp34_ = _data_->candidates; @@ -2805,16 +2806,16 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _data_->_tmp36_ = _data_->candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" gee_array_list_add_all (_data_->_tmp35_, _data_->_tmp36_); -#line 2809 "LibraryMonitor.c" +#line 2810 "LibraryMonitor.c" } } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); -#line 2814 "LibraryMonitor.c" +#line 2815 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_monitor_list); -#line 2818 "LibraryMonitor.c" +#line 2819 "LibraryMonitor.c" } #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp37_ = _data_->associated; @@ -2834,7 +2835,7 @@ 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 2838 "LibraryMonitor.c" +#line 2839 "LibraryMonitor.c" } #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp40_ = _data_->all_candidates; @@ -2876,7 +2877,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 2880 "LibraryMonitor.c" +#line 2881 "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); @@ -2884,7 +2885,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 2888 "LibraryMonitor.c" +#line 2889 "LibraryMonitor.c" _state_1: ; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2893,11 +2894,11 @@ 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 2897 "LibraryMonitor.c" +#line 2898 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_file_it); -#line 2901 "LibraryMonitor.c" +#line 2902 "LibraryMonitor.c" } #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp52_ = _data_->self->priv->unknown_files; @@ -2913,7 +2914,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn if (_data_->_tmp54_ == 0) { #line 388 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (_data_->self); -#line 2917 "LibraryMonitor.c" +#line 2918 "LibraryMonitor.c" } else { #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp55_ = _data_->self->priv->checksums_total; @@ -2931,7 +2932,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _data_->_tmp59_ = _data_->self->priv->checksums_total; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp58_, _data_->_tmp59_); -#line 2935 "LibraryMonitor.c" +#line 2936 "LibraryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->adopted); @@ -2945,14 +2946,14 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn while (_data_->_task_complete_ != TRUE) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2949 "LibraryMonitor.c" +#line 2950 "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 2956 "LibraryMonitor.c" +#line 2957 "LibraryMonitor.c" } @@ -2990,7 +2991,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 2994 "LibraryMonitor.c" +#line 2995 "LibraryMonitor.c" } } @@ -2998,7 +2999,7 @@ 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 3002 "LibraryMonitor.c" +#line 3003 "LibraryMonitor.c" } @@ -3026,7 +3027,7 @@ 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 3030 "LibraryMonitor.c" +#line 3031 "LibraryMonitor.c" LibraryMonitorFindMoveJob* _tmp4_; GFile* _tmp5_; gchar* _tmp6_; @@ -3118,7 +3119,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 3122 "LibraryMonitor.c" +#line 3123 "LibraryMonitor.c" } #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = job; @@ -3126,7 +3127,7 @@ 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 3130 "LibraryMonitor.c" +#line 3131 "LibraryMonitor.c" LibraryMonitorFindMoveJob* _tmp30_; GFile* _tmp31_; gchar* _tmp32_; @@ -3152,13 +3153,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 3156 "LibraryMonitor.c" +#line 3157 "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 3162 "LibraryMonitor.c" +#line 3163 "LibraryMonitor.c" } @@ -3169,7 +3170,7 @@ 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 3173 "LibraryMonitor.c" +#line 3174 "LibraryMonitor.c" } @@ -3179,7 +3180,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { GCancellable* _tmp68_; #line 431 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); -#line 3183 "LibraryMonitor.c" +#line 3184 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -3207,7 +3208,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitor_index = -1; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3211 "LibraryMonitor.c" +#line 3212 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -3232,7 +3233,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!(_tmp6_ < _tmp7_)) { #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3236 "LibraryMonitor.c" +#line 3237 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -3254,7 +3255,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp14_ = monitorables; #line 434 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp14_ != NULL) { -#line 3258 "LibraryMonitor.c" +#line 3259 "LibraryMonitor.c" { GeeIterator* _monitorable_it = NULL; GeeSet* _tmp15_; @@ -3267,7 +3268,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitorable_it = _tmp16_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3271 "LibraryMonitor.c" +#line 3272 "LibraryMonitor.c" GeeIterator* _tmp17_; gboolean _tmp18_; Monitorable* monitorable = NULL; @@ -3283,7 +3284,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!_tmp18_) { #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3287 "LibraryMonitor.c" +#line 3288 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp19_ = _monitorable_it; @@ -3299,11 +3300,11 @@ 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 3303 "LibraryMonitor.c" +#line 3304 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 3307 "LibraryMonitor.c" +#line 3308 "LibraryMonitor.c" } } { @@ -3337,7 +3338,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _object_it = _tmp29_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3341 "LibraryMonitor.c" +#line 3342 "LibraryMonitor.c" GeeIterator* _tmp30_; gboolean _tmp31_; DataObject* object = NULL; @@ -3358,7 +3359,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!_tmp31_) { #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3362 "LibraryMonitor.c" +#line 3363 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp32_ = _object_it; @@ -3376,7 +3377,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp37_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp37_ != NULL) { -#line 3380 "LibraryMonitor.c" +#line 3381 "LibraryMonitor.c" GeeSet* _tmp38_; Monitorable* _tmp39_; gboolean _tmp40_; @@ -3388,11 +3389,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 3392 "LibraryMonitor.c" +#line 3393 "LibraryMonitor.c" } else { #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = FALSE; -#line 3396 "LibraryMonitor.c" +#line 3397 "LibraryMonitor.c" } #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp36_) { @@ -3402,7 +3403,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 3406 "LibraryMonitor.c" +#line 3407 "LibraryMonitor.c" } #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp41_ = monitorable; @@ -3414,11 +3415,11 @@ 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 3418 "LibraryMonitor.c" +#line 3419 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_object_it); -#line 3422 "LibraryMonitor.c" +#line 3423 "LibraryMonitor.c" } { GeeIterator* _source_it = NULL; @@ -3459,7 +3460,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _source_it = _tmp51_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3463 "LibraryMonitor.c" +#line 3464 "LibraryMonitor.c" GeeIterator* _tmp52_; gboolean _tmp53_; DataSource* source = NULL; @@ -3480,7 +3481,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!_tmp53_) { #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3484 "LibraryMonitor.c" +#line 3485 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp54_ = _source_it; @@ -3498,7 +3499,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp59_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp59_ != NULL) { -#line 3502 "LibraryMonitor.c" +#line 3503 "LibraryMonitor.c" GeeSet* _tmp60_; Monitorable* _tmp61_; gboolean _tmp62_; @@ -3510,11 +3511,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 3514 "LibraryMonitor.c" +#line 3515 "LibraryMonitor.c" } else { #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp58_ = FALSE; -#line 3518 "LibraryMonitor.c" +#line 3519 "LibraryMonitor.c" } #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp58_) { @@ -3524,7 +3525,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 3528 "LibraryMonitor.c" +#line 3529 "LibraryMonitor.c" } #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp63_ = monitorable; @@ -3536,33 +3537,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 3540 "LibraryMonitor.c" +#line 3541 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_source_it); -#line 3544 "LibraryMonitor.c" +#line 3545 "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 3550 "LibraryMonitor.c" +#line 3551 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 3554 "LibraryMonitor.c" +#line 3555 "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 3560 "LibraryMonitor.c" +#line 3561 "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 3566 "LibraryMonitor.c" +#line 3567 "LibraryMonitor.c" } #line 464 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); @@ -3580,7 +3581,7 @@ 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 3584 "LibraryMonitor.c" +#line 3585 "LibraryMonitor.c" } @@ -3621,7 +3622,7 @@ 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 3625 "LibraryMonitor.c" +#line 3626 "LibraryMonitor.c" } @@ -3645,7 +3646,7 @@ 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 3649 "LibraryMonitor.c" +#line 3650 "LibraryMonitor.c" } else { GeeQueue* _tmp2_; gint _tmp3_; @@ -3658,13 +3659,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 3662 "LibraryMonitor.c" +#line 3663 "LibraryMonitor.c" } #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 484 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 3668 "LibraryMonitor.c" +#line 3669 "LibraryMonitor.c" } #line 486 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->verify_queue; @@ -3692,7 +3693,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 3696 "LibraryMonitor.c" +#line 3697 "LibraryMonitor.c" } @@ -3707,7 +3708,7 @@ 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 3711 "LibraryMonitor.c" +#line 3712 "LibraryMonitor.c" } @@ -3719,11 +3720,11 @@ static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *sou 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 3724 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 3727 "LibraryMonitor.c" +#line 3728 "LibraryMonitor.c" } @@ -3744,7 +3745,7 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 3748 "LibraryMonitor.c" +#line 3749 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free); @@ -3770,7 +3771,7 @@ 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 3774 "LibraryMonitor.c" +#line 3775 "LibraryMonitor.c" } @@ -3778,24 +3779,24 @@ static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAs LibraryMonitorVerifyMonitorableData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 3782 "LibraryMonitor.c" +#line 3783 "LibraryMonitor.c" } -static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value) { +static void _vala_array_add131 (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 3793 "LibraryMonitor.c" +#line 3794 "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 3799 "LibraryMonitor.c" +#line 3800 "LibraryMonitor.c" } @@ -3811,7 +3812,7 @@ static void library_monitor_verify_monitorable_ready (GObject* source_object, GA _data_->_task_complete_ = TRUE; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3815 "LibraryMonitor.c" +#line 3816 "LibraryMonitor.c" } @@ -3820,7 +3821,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 3824 "LibraryMonitor.c" +#line 3825 "LibraryMonitor.c" } @@ -3829,20 +3830,20 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit switch (_data_->_state_) { #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 3833 "LibraryMonitor.c" +#line 3834 "LibraryMonitor.c" goto _state_0; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 3837 "LibraryMonitor.c" +#line 3838 "LibraryMonitor.c" goto _state_1; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 2: -#line 3841 "LibraryMonitor.c" +#line 3842 "LibraryMonitor.c" goto _state_2; default: #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 3846 "LibraryMonitor.c" +#line 3847 "LibraryMonitor.c" } _state_0: #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3891,7 +3892,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp11_ = _data_->aux_files; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp11__length1 = _data_->aux_files_length1; -#line 3895 "LibraryMonitor.c" +#line 3896 "LibraryMonitor.c" { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_file_collection_length1 = 0; @@ -3907,7 +3908,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _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 3911 "LibraryMonitor.c" +#line 3912 "LibraryMonitor.c" { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp13_ = _data_->files; @@ -3918,10 +3919,10 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #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_); + _vala_array_add131 (&_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 3925 "LibraryMonitor.c" +#line 3926 "LibraryMonitor.c" } } } @@ -3929,7 +3930,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->ctr = 0; -#line 3933 "LibraryMonitor.c" +#line 3934 "LibraryMonitor.c" { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp16_ = TRUE; @@ -3941,7 +3942,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp17_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->ctr = _data_->_tmp17_ + 1; -#line 3945 "LibraryMonitor.c" +#line 3946 "LibraryMonitor.c" } #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp16_ = FALSE; @@ -3955,7 +3956,7 @@ 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 3959 "LibraryMonitor.c" +#line 3960 "LibraryMonitor.c" } #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp20_ = _data_->files; @@ -3979,7 +3980,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp26_ = _data_->info; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp26_ == NULL) { -#line 3983 "LibraryMonitor.c" +#line 3984 "LibraryMonitor.c" { #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp28_ = _data_->file; @@ -3991,7 +3992,7 @@ 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 3995 "LibraryMonitor.c" +#line 3996 "LibraryMonitor.c" _state_1: #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp30_ = g_file_query_info_finish (_data_->_tmp28_, _data_->_res_, &_data_->_inner_error_); @@ -3999,8 +4000,8 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp27_ = _data_->_tmp30_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 4003 "LibraryMonitor.c" - goto __catch486_g_error; +#line 4004 "LibraryMonitor.c" + goto __catch495_g_error; } #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp31_ = _data_->_tmp27_; @@ -4012,10 +4013,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 4016 "LibraryMonitor.c" +#line 4017 "LibraryMonitor.c" } - goto __finally486; - __catch486_g_error: + goto __finally495; + __catch495_g_error: { #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->err = _data_->_inner_error_; @@ -4023,9 +4024,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 4027 "LibraryMonitor.c" +#line 4028 "LibraryMonitor.c" } - __finally486: + __finally495: #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" @@ -4044,7 +4045,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit g_object_unref (_data_->_async_result); #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4048 "LibraryMonitor.c" +#line 4049 "LibraryMonitor.c" } } #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4063,11 +4064,11 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp37_ = media_monitor_is_offline (_data_->_tmp35_, _data_->_tmp36_); #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp33_ = _data_->_tmp37_; -#line 4067 "LibraryMonitor.c" +#line 4068 "LibraryMonitor.c" } else { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp33_ = FALSE; -#line 4071 "LibraryMonitor.c" +#line 4072 "LibraryMonitor.c" } #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp33_) { @@ -4077,7 +4078,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp39_ = _data_->monitorable; #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" media_monitor_update_online (_data_->_tmp38_, _data_->_tmp39_); -#line 4081 "LibraryMonitor.c" +#line 4082 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp41_ = _data_->info; @@ -4091,11 +4092,11 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp44_ = media_monitor_is_offline (_data_->_tmp42_, _data_->_tmp43_); #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp40_ = !_data_->_tmp44_; -#line 4095 "LibraryMonitor.c" +#line 4096 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp40_ = FALSE; -#line 4099 "LibraryMonitor.c" +#line 4100 "LibraryMonitor.c" } #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_data_->_tmp40_) { @@ -4105,7 +4106,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_tmp46_ = _data_->monitorable; #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" media_monitor_update_offline (_data_->_tmp45_, _data_->_tmp46_); -#line 4109 "LibraryMonitor.c" +#line 4110 "LibraryMonitor.c" } } } @@ -4123,7 +4124,7 @@ 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 4127 "LibraryMonitor.c" +#line 4128 "LibraryMonitor.c" } } } @@ -4143,7 +4144,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit _data_->_state_ = 2; #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4147 "LibraryMonitor.c" +#line 4148 "LibraryMonitor.c" _state_2: ; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4168,14 +4169,14 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit 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 4173 "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 4179 "LibraryMonitor.c" +#line 4180 "LibraryMonitor.c" } @@ -4211,7 +4212,7 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { if (_tmp4_ == _tmp5_) { #line 544 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4215 "LibraryMonitor.c" +#line 4216 "LibraryMonitor.c" } #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = value; @@ -4221,7 +4222,7 @@ 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 4225 "LibraryMonitor.c" +#line 4226 "LibraryMonitor.c" gboolean _tmp8_; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = commandline_options_no_runtime_monitoring; @@ -4229,12 +4230,12 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { if (!_tmp8_) { #line 549 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_import_unrepresented_files (self); -#line 4233 "LibraryMonitor.c" +#line 4234 "LibraryMonitor.c" } } else { #line 551 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_cancel_batch_imports (self); -#line 4238 "LibraryMonitor.c" +#line 4239 "LibraryMonitor.c" } } @@ -4257,7 +4258,7 @@ 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 4261 "LibraryMonitor.c" +#line 4262 "LibraryMonitor.c" GFile* _tmp5_; gboolean _tmp6_; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4266,15 +4267,15 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { _tmp6_ = library_monitor_is_supported_filetype (self, _tmp5_); #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp6_; -#line 4270 "LibraryMonitor.c" +#line 4271 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 4274 "LibraryMonitor.c" +#line 4275 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 4278 "LibraryMonitor.c" +#line 4279 "LibraryMonitor.c" GFile* _tmp7_; gboolean _tmp8_; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4283,15 +4284,15 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { _tmp8_ = library_monitor_is_blacklisted (_tmp7_); #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = !_tmp8_; -#line 4287 "LibraryMonitor.c" +#line 4288 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 4291 "LibraryMonitor.c" +#line 4292 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 4295 "LibraryMonitor.c" +#line 4296 "LibraryMonitor.c" GeeHashSet* _tmp9_; GFile* _tmp10_; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4300,7 +4301,7 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { _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 4304 "LibraryMonitor.c" +#line 4305 "LibraryMonitor.c" } } @@ -4310,7 +4311,7 @@ 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 4314 "LibraryMonitor.c" +#line 4315 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp0_; @@ -4323,7 +4324,7 @@ 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 4327 "LibraryMonitor.c" +#line 4328 "LibraryMonitor.c" GeeIterator* _tmp2_; gboolean _tmp3_; GFile* file = NULL; @@ -4338,7 +4339,7 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec if (!_tmp3_) { #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4342 "LibraryMonitor.c" +#line 4343 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = _file_it; @@ -4352,11 +4353,11 @@ 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 4356 "LibraryMonitor.c" +#line 4357 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4360 "LibraryMonitor.c" +#line 4361 "LibraryMonitor.c" } } @@ -4374,7 +4375,7 @@ 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 4378 "LibraryMonitor.c" +#line 4379 "LibraryMonitor.c" } @@ -4419,7 +4420,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 4423 "LibraryMonitor.c" +#line 4424 "LibraryMonitor.c" } #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->import_queue; @@ -4433,7 +4434,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 4437 "LibraryMonitor.c" +#line 4438 "LibraryMonitor.c" } #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->current_batch_import; @@ -4443,7 +4444,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 4447 "LibraryMonitor.c" +#line 4448 "LibraryMonitor.c" } #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp6_ = self->priv->import_queue; @@ -4469,7 +4470,7 @@ 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 4473 "LibraryMonitor.c" +#line 4474 "LibraryMonitor.c" } else { time_t _tmp14_; time_t _tmp15_; @@ -4479,11 +4480,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _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 4483 "LibraryMonitor.c" +#line 4484 "LibraryMonitor.c" } #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp12_) { -#line 4487 "LibraryMonitor.c" +#line 4488 "LibraryMonitor.c" BatchImportRoll* _tmp16_; #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = batch_import_roll_new (); @@ -4491,7 +4492,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { _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 4495 "LibraryMonitor.c" +#line 4496 "LibraryMonitor.c" } #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = now; @@ -4501,7 +4502,7 @@ 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 4505 "LibraryMonitor.c" +#line 4506 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; GeeHashSet* _tmp19_; @@ -4514,7 +4515,7 @@ 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 4518 "LibraryMonitor.c" +#line 4519 "LibraryMonitor.c" GeeIterator* _tmp21_; gboolean _tmp22_; GFile* file = NULL; @@ -4536,7 +4537,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { if (!_tmp22_) { #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4540 "LibraryMonitor.c" +#line 4541 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp23_ = _file_it; @@ -4554,14 +4555,14 @@ 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 4558 "LibraryMonitor.c" +#line 4559 "LibraryMonitor.c" } #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = jobs; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = file; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = file_import_job_new (_tmp28_, FALSE); + _tmp29_ = file_import_job_new (_tmp28_, FALSE, TRUE); #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp30_ = _tmp29_; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4576,11 +4577,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 4580 "LibraryMonitor.c" +#line 4581 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4584 "LibraryMonitor.c" +#line 4585 "LibraryMonitor.c" } #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp33_ = self->priv->import_queue; @@ -4618,28 +4619,28 @@ 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 4622 "LibraryMonitor.c" +#line 4623 "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 4629 "LibraryMonitor.c" +#line 4630 "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 4636 "LibraryMonitor.c" +#line 4637 "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 4643 "LibraryMonitor.c" +#line 4644 "LibraryMonitor.c" } @@ -4660,7 +4661,7 @@ 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 4664 "LibraryMonitor.c" +#line 4665 "LibraryMonitor.c" } else { GeeArrayList* _tmp2_; gint _tmp3_; @@ -4673,13 +4674,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 4677 "LibraryMonitor.c" +#line 4678 "LibraryMonitor.c" } #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 615 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4683 "LibraryMonitor.c" +#line 4684 "LibraryMonitor.c" } #line 617 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->batch_import_queue; @@ -4705,7 +4706,7 @@ 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 4709 "LibraryMonitor.c" +#line 4710 "LibraryMonitor.c" } @@ -4773,13 +4774,13 @@ 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 4777 "LibraryMonitor.c" +#line 4778 "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 4783 "LibraryMonitor.c" +#line 4784 "LibraryMonitor.c" } } @@ -4794,7 +4795,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { ctr = 0; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4798 "LibraryMonitor.c" +#line 4799 "LibraryMonitor.c" gint _tmp0_; GeeArrayList* _tmp1_; gint _tmp2_; @@ -4822,7 +4823,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { if (!(_tmp0_ < _tmp3_)) { #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4826 "LibraryMonitor.c" +#line 4827 "LibraryMonitor.c" } #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->batch_import_queue; @@ -4840,7 +4841,7 @@ 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 4844 "LibraryMonitor.c" +#line 4845 "LibraryMonitor.c" gint _tmp10_; #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = ctr; @@ -4848,7 +4849,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { ctr = _tmp10_ + 1; #line 650 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 4852 "LibraryMonitor.c" +#line 4853 "LibraryMonitor.c" } #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = self->priv->batch_import_queue; @@ -4864,25 +4865,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 4868 "LibraryMonitor.c" +#line 4869 "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 4874 "LibraryMonitor.c" +#line 4875 "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 4880 "LibraryMonitor.c" +#line 4881 "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 4886 "LibraryMonitor.c" +#line 4887 "LibraryMonitor.c" } @@ -4891,7 +4892,7 @@ static void library_monitor_on_import_preparing (LibraryMonitor* self) { g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 665 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL], 0); -#line 4895 "LibraryMonitor.c" +#line 4896 "LibraryMonitor.c" } @@ -4906,7 +4907,7 @@ static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 co _tmp1_ = total_bytes; #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4910 "LibraryMonitor.c" +#line 4911 "LibraryMonitor.c" } @@ -4961,7 +4962,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor _g_free0 (_tmp7_); #line 677 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, (guint64) 0, (guint64) 0); -#line 4965 "LibraryMonitor.c" +#line 4966 "LibraryMonitor.c" { GeeList* _result_list = NULL; ImportManifest* _tmp8_; @@ -4992,7 +4993,7 @@ 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 4996 "LibraryMonitor.c" +#line 4997 "LibraryMonitor.c" gint _tmp14_; gint _tmp15_; gint _tmp16_; @@ -5014,7 +5015,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 5018 "LibraryMonitor.c" +#line 5019 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = _result_list; @@ -5030,7 +5031,7 @@ 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 5034 "LibraryMonitor.c" +#line 5035 "LibraryMonitor.c" GeeHashSet* _tmp22_; BatchImportResult* _tmp23_; GFile* _tmp24_; @@ -5042,15 +5043,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 5046 "LibraryMonitor.c" +#line 5047 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5050 "LibraryMonitor.c" +#line 5051 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5054 "LibraryMonitor.c" +#line 5055 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = manifest; @@ -5062,14 +5063,14 @@ 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 5066 "LibraryMonitor.c" +#line 5067 "LibraryMonitor.c" GeeArrayList* to_tombstone = 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 5073 "LibraryMonitor.c" +#line 5074 "LibraryMonitor.c" { GeeList* _result_list = NULL; ImportManifest* _tmp30_; @@ -5100,7 +5101,7 @@ 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 5104 "LibraryMonitor.c" +#line 5105 "LibraryMonitor.c" gint _tmp36_; gint _tmp37_; gint _tmp38_; @@ -5132,7 +5133,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 5136 "LibraryMonitor.c" +#line 5137 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp39_ = _result_list; @@ -5154,7 +5155,7 @@ 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 5158 "LibraryMonitor.c" +#line 5159 "LibraryMonitor.c" BatchImportResult* _tmp46_; GFile* _tmp47_; gchar* _tmp48_; @@ -5177,7 +5178,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 5181 "LibraryMonitor.c" +#line 5182 "LibraryMonitor.c" } #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp50_ = to_tombstone; @@ -5201,11 +5202,11 @@ 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 5205 "LibraryMonitor.c" +#line 5206 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5209 "LibraryMonitor.c" +#line 5210 "LibraryMonitor.c" } { GeeArrayList* _tmp57_; @@ -5217,8 +5218,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 5221 "LibraryMonitor.c" - goto __catch487_database_error; +#line 5222 "LibraryMonitor.c" + goto __catch496_database_error; } #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_tombstone); @@ -5228,11 +5229,11 @@ 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 5232 "LibraryMonitor.c" +#line 5233 "LibraryMonitor.c" } } - goto __finally487; - __catch487_database_error: + goto __finally496; + __catch496_database_error: { GError* err = NULL; GError* _tmp58_; @@ -5246,9 +5247,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 5250 "LibraryMonitor.c" +#line 5251 "LibraryMonitor.c" } - __finally487: + __finally496: #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5259,11 +5260,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 5263 "LibraryMonitor.c" +#line 5264 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_tombstone); -#line 5267 "LibraryMonitor.c" +#line 5268 "LibraryMonitor.c" } #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp59_ = self->priv->pending_imports; @@ -5283,7 +5284,7 @@ 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 5287 "LibraryMonitor.c" +#line 5288 "LibraryMonitor.c" } @@ -5317,14 +5318,14 @@ 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 5321 "LibraryMonitor.c" +#line 5322 "LibraryMonitor.c" { 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 5328 "LibraryMonitor.c" +#line 5329 "LibraryMonitor.c" { GeeHashSet* _tmp7_; GFile* _tmp8_; @@ -5334,16 +5335,16 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) { _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 5338 "LibraryMonitor.c" +#line 5339 "LibraryMonitor.c" } - __finally488: + __finally497: { 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 5347 "LibraryMonitor.c" +#line 5348 "LibraryMonitor.c" } #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5353,7 +5354,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 5357 "LibraryMonitor.c" +#line 5358 "LibraryMonitor.c" } } } @@ -5363,14 +5364,14 @@ 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 5367 "LibraryMonitor.c" +#line 5368 "LibraryMonitor.c" { 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 5374 "LibraryMonitor.c" +#line 5375 "LibraryMonitor.c" { gboolean _tmp1_ = FALSE; GeeHashSet* _tmp2_; @@ -5384,7 +5385,7 @@ 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 5388 "LibraryMonitor.c" +#line 5389 "LibraryMonitor.c" HashTimedQueue* _tmp5_; GFile* _tmp6_; gboolean _tmp7_; @@ -5396,15 +5397,15 @@ 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 5400 "LibraryMonitor.c" +#line 5401 "LibraryMonitor.c" } else { #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5404 "LibraryMonitor.c" +#line 5405 "LibraryMonitor.c" } #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5408 "LibraryMonitor.c" +#line 5409 "LibraryMonitor.c" HashTimedQueue* _tmp8_; GFile* _tmp9_; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5413,17 +5414,17 @@ void library_monitor_unblacklist_file (GFile* file) { _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 5417 "LibraryMonitor.c" +#line 5418 "LibraryMonitor.c" } } - __finally489: + __finally498: { 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 5427 "LibraryMonitor.c" +#line 5428 "LibraryMonitor.c" } #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5433,7 +5434,7 @@ void library_monitor_unblacklist_file (GFile* file) { g_clear_error (&_inner_error_); #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5437 "LibraryMonitor.c" +#line 5438 "LibraryMonitor.c" } } } @@ -5444,14 +5445,14 @@ 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 5448 "LibraryMonitor.c" +#line 5449 "LibraryMonitor.c" { 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 5455 "LibraryMonitor.c" +#line 5456 "LibraryMonitor.c" { GeeHashSet* _tmp1_; GFile* _tmp2_; @@ -5464,16 +5465,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 5468 "LibraryMonitor.c" +#line 5469 "LibraryMonitor.c" } - __finally490: + __finally499: { 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 5477 "LibraryMonitor.c" +#line 5478 "LibraryMonitor.c" } #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5483,12 +5484,12 @@ 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 5487 "LibraryMonitor.c" +#line 5488 "LibraryMonitor.c" } } #line 747 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (removed) { -#line 5492 "LibraryMonitor.c" +#line 5493 "LibraryMonitor.c" GFile* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; @@ -5510,7 +5511,7 @@ 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 5514 "LibraryMonitor.c" +#line 5515 "LibraryMonitor.c" } else { GFile* _tmp10_; gchar* _tmp11_; @@ -5525,7 +5526,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 5529 "LibraryMonitor.c" +#line 5530 "LibraryMonitor.c" } } @@ -5535,7 +5536,7 @@ 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 5539 "LibraryMonitor.c" +#line 5540 "LibraryMonitor.c" { GeeHashSet* _tmp0_; gboolean _tmp6_ = FALSE; @@ -5543,7 +5544,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) { _tmp0_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5547 "LibraryMonitor.c" +#line 5548 "LibraryMonitor.c" { GeeHashSet* _tmp1_; GFile* _tmp2_; @@ -5556,27 +5557,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 5560 "LibraryMonitor.c" +#line 5561 "LibraryMonitor.c" { 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 5567 "LibraryMonitor.c" +#line 5568 "LibraryMonitor.c" } #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5571 "LibraryMonitor.c" +#line 5572 "LibraryMonitor.c" } - __finally491: + __finally500: { 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 5580 "LibraryMonitor.c" +#line 5581 "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); @@ -5584,7 +5585,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) { g_clear_error (&_inner_error_); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return _tmp6_; -#line 5588 "LibraryMonitor.c" +#line 5589 "LibraryMonitor.c" } } @@ -5621,7 +5622,7 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi result = _tmp5_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5625 "LibraryMonitor.c" +#line 5626 "LibraryMonitor.c" } @@ -5637,11 +5638,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp0_) { #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5641 "LibraryMonitor.c" +#line 5642 "LibraryMonitor.c" } #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = NULL; -#line 5645 "LibraryMonitor.c" +#line 5646 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp1_; @@ -5662,7 +5663,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _file_it = _tmp4_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5666 "LibraryMonitor.c" +#line 5667 "LibraryMonitor.c" GeeIterator* _tmp5_; gboolean _tmp6_; GFile* file = NULL; @@ -5694,7 +5695,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp6_) { #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5698 "LibraryMonitor.c" +#line 5699 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp7_ = _file_it; @@ -5714,7 +5715,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (_tmp12_ == NULL) { #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = TRUE; -#line 5718 "LibraryMonitor.c" +#line 5719 "LibraryMonitor.c" } else { GFileInfo* _tmp13_; GFileType _tmp14_; @@ -5724,7 +5725,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _tmp14_ = g_file_info_get_file_type (_tmp13_); #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR; -#line 5728 "LibraryMonitor.c" +#line 5729 "LibraryMonitor.c" } #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp11_) { @@ -5734,7 +5735,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 5738 "LibraryMonitor.c" +#line 5739 "LibraryMonitor.c" } #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp15_ = self->priv->pending_imports; @@ -5750,7 +5751,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 5754 "LibraryMonitor.c" +#line 5755 "LibraryMonitor.c" } #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = tombstone_global; @@ -5766,11 +5767,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5770 "LibraryMonitor.c" +#line 5771 "LibraryMonitor.c" } #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = FALSE; -#line 5774 "LibraryMonitor.c" +#line 5775 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp21_; @@ -5798,7 +5799,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _monitor_index = -1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5802 "LibraryMonitor.c" +#line 5803 "LibraryMonitor.c" gint _tmp26_; gint _tmp27_; gint _tmp28_; @@ -5821,7 +5822,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!(_tmp27_ < _tmp28_)) { #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5825 "LibraryMonitor.c" +#line 5826 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp29_ = _monitor_list; @@ -5845,15 +5846,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 5849 "LibraryMonitor.c" +#line 5850 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 5853 "LibraryMonitor.c" +#line 5854 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 5857 "LibraryMonitor.c" +#line 5858 "LibraryMonitor.c" } #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp35_ = represented; @@ -5865,7 +5866,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 5869 "LibraryMonitor.c" +#line 5870 "LibraryMonitor.c" } #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp36_ = file; @@ -5879,13 +5880,13 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (file); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5883 "LibraryMonitor.c" +#line 5884 "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 5889 "LibraryMonitor.c" +#line 5890 "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); @@ -5893,7 +5894,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _g_object_unref0 (to_import); #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = _tmp39_; -#line 5897 "LibraryMonitor.c" +#line 5898 "LibraryMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp40_ = to_import; @@ -5905,27 +5906,27 @@ 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 5909 "LibraryMonitor.c" +#line 5910 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 5913 "LibraryMonitor.c" +#line 5914 "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 5919 "LibraryMonitor.c" +#line 5920 "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 5925 "LibraryMonitor.c" +#line 5926 "LibraryMonitor.c" } #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); -#line 5929 "LibraryMonitor.c" +#line 5930 "LibraryMonitor.c" } @@ -5941,7 +5942,7 @@ 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 5945 "LibraryMonitor.c" +#line 5946 "LibraryMonitor.c" GFile* _tmp3_; gboolean _tmp4_; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5950,15 +5951,15 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel _tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_); #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp4_; -#line 5954 "LibraryMonitor.c" +#line 5955 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5958 "LibraryMonitor.c" +#line 5959 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5962 "LibraryMonitor.c" +#line 5963 "LibraryMonitor.c" TombstoneSourceCollection* _tmp5_; GFile* _tmp6_; gboolean _tmp7_; @@ -5970,15 +5971,15 @@ 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 5974 "LibraryMonitor.c" +#line 5975 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 5978 "LibraryMonitor.c" +#line 5979 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 5982 "LibraryMonitor.c" +#line 5983 "LibraryMonitor.c" GFile* _tmp8_; gchar* _tmp9_; gchar* _tmp10_; @@ -6005,7 +6006,7 @@ 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 6009 "LibraryMonitor.c" +#line 6010 "LibraryMonitor.c" } } @@ -6031,7 +6032,7 @@ 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 6035 "LibraryMonitor.c" +#line 6036 "LibraryMonitor.c" GFile* _tmp2_; GFileInfo* _tmp3_; #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6042,11 +6043,11 @@ 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 6046 "LibraryMonitor.c" +#line 6047 "LibraryMonitor.c" } #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6050 "LibraryMonitor.c" +#line 6051 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp4_; @@ -6074,7 +6075,7 @@ 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 6078 "LibraryMonitor.c" +#line 6079 "LibraryMonitor.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -6098,7 +6099,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 6102 "LibraryMonitor.c" +#line 6103 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = _monitor_list; @@ -6124,28 +6125,28 @@ 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 6128 "LibraryMonitor.c" +#line 6129 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6132 "LibraryMonitor.c" +#line 6133 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6136 "LibraryMonitor.c" +#line 6137 "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 6142 "LibraryMonitor.c" +#line 6143 "LibraryMonitor.c" GeeHashSet* all_candidates = NULL; gboolean _tmp78_ = FALSE; gboolean _tmp79_ = FALSE; gboolean _tmp80_; #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = NULL; -#line 6149 "LibraryMonitor.c" +#line 6150 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp20_; @@ -6173,7 +6174,7 @@ 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 6177 "LibraryMonitor.c" +#line 6178 "LibraryMonitor.c" gint _tmp25_; gint _tmp26_; gint _tmp27_; @@ -6202,7 +6203,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 6206 "LibraryMonitor.c" +#line 6207 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp28_ = _monitor_list; @@ -6230,18 +6231,18 @@ 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 6234 "LibraryMonitor.c" +#line 6235 "LibraryMonitor.c" } else { 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 6241 "LibraryMonitor.c" +#line 6242 "LibraryMonitor.c" } #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp36_) { -#line 6245 "LibraryMonitor.c" +#line 6246 "LibraryMonitor.c" MediaMonitor* _tmp39_; gchar* _tmp40_; gchar* _tmp41_; @@ -6288,7 +6289,7 @@ 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 6292 "LibraryMonitor.c" +#line 6293 "LibraryMonitor.c" } else { gboolean _tmp49_ = FALSE; GeeCollection* _tmp50_; @@ -6296,7 +6297,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _tmp50_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp50_ != NULL) { -#line 6300 "LibraryMonitor.c" +#line 6301 "LibraryMonitor.c" GeeCollection* _tmp51_; gint _tmp52_; gint _tmp53_; @@ -6308,15 +6309,15 @@ 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 6312 "LibraryMonitor.c" +#line 6313 "LibraryMonitor.c" } else { #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp49_ = FALSE; -#line 6316 "LibraryMonitor.c" +#line 6317 "LibraryMonitor.c" } #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp49_) { -#line 6320 "LibraryMonitor.c" +#line 6321 "LibraryMonitor.c" MediaMonitor* _tmp54_; gchar* _tmp55_; gchar* _tmp56_; @@ -6363,7 +6364,7 @@ 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 6367 "LibraryMonitor.c" +#line 6368 "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); @@ -6371,7 +6372,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _g_object_unref0 (all_candidates); #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = _tmp66_; -#line 6375 "LibraryMonitor.c" +#line 6376 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -6385,7 +6386,7 @@ 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 6389 "LibraryMonitor.c" +#line 6390 "LibraryMonitor.c" GeeIterator* _tmp69_; gboolean _tmp70_; Monitorable* candidate = NULL; @@ -6402,7 +6403,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 6406 "LibraryMonitor.c" +#line 6407 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp71_ = _candidate_it; @@ -6418,7 +6419,7 @@ 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 6422 "LibraryMonitor.c" +#line 6423 "LibraryMonitor.c" GeeHashSet* _tmp76_; Monitorable* _tmp77_; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6427,15 +6428,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF _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 6431 "LibraryMonitor.c" +#line 6432 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 6435 "LibraryMonitor.c" +#line 6436 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 6439 "LibraryMonitor.c" +#line 6440 "LibraryMonitor.c" } } } @@ -6443,31 +6444,31 @@ 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 6447 "LibraryMonitor.c" +#line 6448 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6451 "LibraryMonitor.c" +#line 6452 "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 6457 "LibraryMonitor.c" +#line 6458 "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 6463 "LibraryMonitor.c" +#line 6464 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp79_ = FALSE; -#line 6467 "LibraryMonitor.c" +#line 6468 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp79_) { -#line 6471 "LibraryMonitor.c" +#line 6472 "LibraryMonitor.c" GeeHashSet* _tmp82_; gint _tmp83_; gint _tmp84_; @@ -6479,15 +6480,15 @@ 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 6483 "LibraryMonitor.c" +#line 6484 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp78_ = FALSE; -#line 6487 "LibraryMonitor.c" +#line 6488 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp78_) { -#line 6491 "LibraryMonitor.c" +#line 6492 "LibraryMonitor.c" GeeHashSet* _tmp85_; gint _tmp86_; gint _tmp87_; @@ -6539,23 +6540,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 6543 "LibraryMonitor.c" +#line 6544 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); -#line 6547 "LibraryMonitor.c" +#line 6548 "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 6553 "LibraryMonitor.c" +#line 6554 "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 6559 "LibraryMonitor.c" +#line 6560 "LibraryMonitor.c" } #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp100_ = file; @@ -6563,7 +6564,7 @@ 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 6567 "LibraryMonitor.c" +#line 6568 "LibraryMonitor.c" } @@ -6591,7 +6592,7 @@ 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 6595 "LibraryMonitor.c" +#line 6596 "LibraryMonitor.c" LibraryMonitorRuntimeFindMoveJob* _tmp4_; GFile* _tmp5_; gchar* _tmp6_; @@ -6618,7 +6619,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 6621 "LibraryMonitor.c" +#line 6622 "LibraryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = job; @@ -6626,7 +6627,7 @@ 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 6629 "LibraryMonitor.c" +#line 6630 "LibraryMonitor.c" MediaMonitor* monitor = NULL; LibraryMonitorRuntimeFindMoveJob* _tmp13_; Monitorable* _tmp14_; @@ -6669,7 +6670,7 @@ 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 6672 "LibraryMonitor.c" +#line 6673 "LibraryMonitor.c" } else { LibraryMonitorRuntimeFindMoveJob* _tmp24_; GFile* _tmp25_; @@ -6679,11 +6680,11 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self _tmp25_ = _tmp24_->file; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6682 "LibraryMonitor.c" +#line 6683 "LibraryMonitor.c" } #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 6686 "LibraryMonitor.c" +#line 6687 "LibraryMonitor.c" } @@ -6713,7 +6714,7 @@ 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 6716 "LibraryMonitor.c" +#line 6717 "LibraryMonitor.c" } else { GFile* _tmp3_; gboolean _tmp4_; @@ -6723,11 +6724,11 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil _tmp4_ = library_monitor_is_blacklisted (_tmp3_); #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = _tmp4_; -#line 6726 "LibraryMonitor.c" +#line 6727 "LibraryMonitor.c" } #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6730 "LibraryMonitor.c" +#line 6731 "LibraryMonitor.c" GFile* _tmp5_; GFile* _tmp6_; GFileInfo* _tmp7_; @@ -6741,11 +6742,11 @@ 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 6744 "LibraryMonitor.c" +#line 6745 "LibraryMonitor.c" } #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6748 "LibraryMonitor.c" +#line 6749 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp8_; @@ -6773,7 +6774,7 @@ 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 6776 "LibraryMonitor.c" +#line 6777 "LibraryMonitor.c" gint _tmp13_; gint _tmp14_; gint _tmp15_; @@ -6798,7 +6799,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 6801 "LibraryMonitor.c" +#line 6802 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp16_ = _monitor_list; @@ -6826,27 +6827,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 6829 "LibraryMonitor.c" +#line 6830 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6833 "LibraryMonitor.c" +#line 6834 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6837 "LibraryMonitor.c" +#line 6838 "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 6843 "LibraryMonitor.c" +#line 6844 "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 6849 "LibraryMonitor.c" +#line 6850 "LibraryMonitor.c" } #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp26_ = old_file; @@ -6856,7 +6857,7 @@ 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 6859 "LibraryMonitor.c" +#line 6860 "LibraryMonitor.c" } @@ -6877,7 +6878,7 @@ 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 6880 "LibraryMonitor.c" +#line 6881 "LibraryMonitor.c" GFile* _tmp2_; #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; @@ -6885,11 +6886,11 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF 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 6888 "LibraryMonitor.c" +#line 6889 "LibraryMonitor.c" } #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6892 "LibraryMonitor.c" +#line 6893 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp3_; @@ -6917,7 +6918,7 @@ 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 6920 "LibraryMonitor.c" +#line 6921 "LibraryMonitor.c" gint _tmp8_; gint _tmp9_; gint _tmp10_; @@ -6940,7 +6941,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 6943 "LibraryMonitor.c" +#line 6944 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -6964,33 +6965,33 @@ 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 6967 "LibraryMonitor.c" +#line 6968 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6971 "LibraryMonitor.c" +#line 6972 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6975 "LibraryMonitor.c" +#line 6976 "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 6981 "LibraryMonitor.c" +#line 6982 "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 6987 "LibraryMonitor.c" +#line 6988 "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 6993 "LibraryMonitor.c" +#line 6994 "LibraryMonitor.c" } @@ -7011,7 +7012,7 @@ 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 7014 "LibraryMonitor.c" +#line 7015 "LibraryMonitor.c" GFile* _tmp2_; #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; @@ -7019,11 +7020,11 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito 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 7022 "LibraryMonitor.c" +#line 7023 "LibraryMonitor.c" } #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7026 "LibraryMonitor.c" +#line 7027 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp3_; @@ -7051,7 +7052,7 @@ 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 7054 "LibraryMonitor.c" +#line 7055 "LibraryMonitor.c" gint _tmp8_; gint _tmp9_; gint _tmp10_; @@ -7074,7 +7075,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 7077 "LibraryMonitor.c" +#line 7078 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7098,33 +7099,33 @@ 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 7101 "LibraryMonitor.c" +#line 7102 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7105 "LibraryMonitor.c" +#line 7106 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7109 "LibraryMonitor.c" +#line 7110 "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 7115 "LibraryMonitor.c" +#line 7116 "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 7121 "LibraryMonitor.c" +#line 7122 "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 7127 "LibraryMonitor.c" +#line 7128 "LibraryMonitor.c" } @@ -7148,7 +7149,7 @@ 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 7151 "LibraryMonitor.c" +#line 7152 "LibraryMonitor.c" GFile* _tmp2_; GFileInfo* _tmp3_; #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7159,11 +7160,11 @@ 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 7162 "LibraryMonitor.c" +#line 7163 "LibraryMonitor.c" } #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7166 "LibraryMonitor.c" +#line 7167 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp4_; @@ -7191,7 +7192,7 @@ 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 7194 "LibraryMonitor.c" +#line 7195 "LibraryMonitor.c" gint _tmp9_; gint _tmp10_; gint _tmp11_; @@ -7215,7 +7216,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 7218 "LibraryMonitor.c" +#line 7219 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp12_ = _monitor_list; @@ -7241,27 +7242,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 7244 "LibraryMonitor.c" +#line 7245 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7248 "LibraryMonitor.c" +#line 7249 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7252 "LibraryMonitor.c" +#line 7253 "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 7258 "LibraryMonitor.c" +#line 7259 "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 7264 "LibraryMonitor.c" +#line 7265 "LibraryMonitor.c" } #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp21_ = file; @@ -7269,7 +7270,7 @@ 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 7272 "LibraryMonitor.c" +#line 7273 "LibraryMonitor.c" } @@ -7290,7 +7291,7 @@ 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 7293 "LibraryMonitor.c" +#line 7294 "LibraryMonitor.c" GFile* _tmp2_; #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = file; @@ -7298,11 +7299,11 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF 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 7301 "LibraryMonitor.c" +#line 7302 "LibraryMonitor.c" } #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7305 "LibraryMonitor.c" +#line 7306 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp3_; @@ -7330,7 +7331,7 @@ 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 7333 "LibraryMonitor.c" +#line 7334 "LibraryMonitor.c" gint _tmp8_; gint _tmp9_; gint _tmp10_; @@ -7353,7 +7354,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 7356 "LibraryMonitor.c" +#line 7357 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = _monitor_list; @@ -7377,21 +7378,21 @@ 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 7380 "LibraryMonitor.c" +#line 7381 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7384 "LibraryMonitor.c" +#line 7385 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7388 "LibraryMonitor.c" +#line 7389 "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 7394 "LibraryMonitor.c" +#line 7395 "LibraryMonitor.c" Tombstone* tombstone = NULL; TombstoneSourceCollection* _tmp18_; GFile* _tmp19_; @@ -7410,7 +7411,7 @@ 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 7413 "LibraryMonitor.c" +#line 7414 "LibraryMonitor.c" GFile* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; @@ -7432,7 +7433,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 7435 "LibraryMonitor.c" +#line 7436 "LibraryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp27_ = file; @@ -7440,13 +7441,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 7443 "LibraryMonitor.c" +#line 7444 "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 7449 "LibraryMonitor.c" +#line 7450 "LibraryMonitor.c" } @@ -7465,19 +7466,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 7468 "LibraryMonitor.c" +#line 7469 "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 7474 "LibraryMonitor.c" +#line 7475 "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 7480 "LibraryMonitor.c" +#line 7481 "LibraryMonitor.c" } @@ -7496,33 +7497,33 @@ 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 7499 "LibraryMonitor.c" +#line 7500 "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 7505 "LibraryMonitor.c" +#line 7506 "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 7511 "LibraryMonitor.c" +#line 7512 "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 7518 "LibraryMonitor.c" +#line 7519 "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 7525 "LibraryMonitor.c" +#line 7526 "LibraryMonitor.c" } @@ -7575,21 +7576,21 @@ 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 7578 "LibraryMonitor.c" +#line 7579 "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 7585 "LibraryMonitor.c" +#line 7586 "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 7592 "LibraryMonitor.c" +#line 7593 "LibraryMonitor.c" } @@ -7613,7 +7614,7 @@ 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 7616 "LibraryMonitor.c" +#line 7617 "LibraryMonitor.c" GeeIterator* _tmp2_; gboolean _tmp3_; GeeIterator* _tmp4_; @@ -7631,7 +7632,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 7634 "LibraryMonitor.c" +#line 7635 "LibraryMonitor.c" } #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = iter; @@ -7653,13 +7654,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 7656 "LibraryMonitor.c" +#line 7657 "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 7662 "LibraryMonitor.c" +#line 7663 "LibraryMonitor.c" } } #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7674,11 +7675,11 @@ 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 7677 "LibraryMonitor.c" +#line 7678 "LibraryMonitor.c" } #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 7681 "LibraryMonitor.c" +#line 7682 "LibraryMonitor.c" { gchar* _tmp15_ = NULL; GFile* _tmp16_; @@ -7692,8 +7693,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 7695 "LibraryMonitor.c" - goto __catch492_g_error; +#line 7696 "LibraryMonitor.c" + goto __catch501_g_error; } #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp18_ = _tmp15_; @@ -7705,10 +7706,10 @@ 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 7708 "LibraryMonitor.c" +#line 7709 "LibraryMonitor.c" } - goto __finally492; - __catch492_g_error: + goto __finally501; + __catch501_g_error: { GError* err = NULL; GError* _tmp19_; @@ -7733,9 +7734,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 7736 "LibraryMonitor.c" +#line 7737 "LibraryMonitor.c" } - __finally492: + __finally501: #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7748,7 +7749,7 @@ 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 7751 "LibraryMonitor.c" +#line 7752 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -7762,7 +7763,7 @@ 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 7765 "LibraryMonitor.c" +#line 7766 "LibraryMonitor.c" GeeIterator* _tmp23_; gboolean _tmp24_; Monitorable* candidate = NULL; @@ -7784,7 +7785,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 7787 "LibraryMonitor.c" +#line 7788 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp25_ = _candidate_it; @@ -7810,13 +7811,13 @@ 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 7813 "LibraryMonitor.c" +#line 7814 "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 7819 "LibraryMonitor.c" +#line 7820 "LibraryMonitor.c" GFile* _tmp33_; gchar* _tmp34_; gchar* _tmp35_; @@ -7860,7 +7861,7 @@ 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 7862 "LibraryMonitor.c" +#line 7863 "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); @@ -7868,7 +7869,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { _g_object_unref0 (self->losers); #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->losers = _tmp43_; -#line 7870 "LibraryMonitor.c" +#line 7871 "LibraryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp44_ = self->losers; @@ -7880,7 +7881,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 7882 "LibraryMonitor.c" +#line 7883 "LibraryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp46_ = candidate; @@ -7892,17 +7893,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 7894 "LibraryMonitor.c" +#line 7895 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 7898 "LibraryMonitor.c" +#line 7899 "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 7904 "LibraryMonitor.c" +#line 7905 "LibraryMonitor.c" } @@ -7913,7 +7914,7 @@ static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobC ((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 7915 "LibraryMonitor.c" +#line 7916 "LibraryMonitor.c" } @@ -7924,7 +7925,7 @@ 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 7926 "LibraryMonitor.c" +#line 7927 "LibraryMonitor.c" } @@ -7944,7 +7945,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 7946 "LibraryMonitor.c" +#line 7947 "LibraryMonitor.c" } @@ -7963,7 +7964,7 @@ 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 7965 "LibraryMonitor.c" +#line 7966 "LibraryMonitor.c" } @@ -8013,14 +8014,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 8015 "LibraryMonitor.c" +#line 8016 "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 8022 "LibraryMonitor.c" +#line 8023 "LibraryMonitor.c" } @@ -8032,7 +8033,7 @@ 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 8034 "LibraryMonitor.c" +#line 8035 "LibraryMonitor.c" { gchar* _tmp0_ = NULL; GFile* _tmp1_; @@ -8046,8 +8047,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 8048 "LibraryMonitor.c" - goto __catch493_g_error; +#line 8049 "LibraryMonitor.c" + goto __catch502_g_error; } #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = _tmp0_; @@ -8059,10 +8060,10 @@ 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 8061 "LibraryMonitor.c" +#line 8062 "LibraryMonitor.c" } - goto __finally493; - __catch493_g_error: + goto __finally502; + __catch502_g_error: { GError* err = NULL; GError* _tmp4_; @@ -8085,9 +8086,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 8087 "LibraryMonitor.c" +#line 8088 "LibraryMonitor.c" } - __finally493: + __finally502: #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8098,7 +8099,7 @@ 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 8100 "LibraryMonitor.c" +#line 8101 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -8112,7 +8113,7 @@ 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 8114 "LibraryMonitor.c" +#line 8115 "LibraryMonitor.c" GeeIterator* _tmp8_; gboolean _tmp9_; Monitorable* candidate = NULL; @@ -8131,7 +8132,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 8133 "LibraryMonitor.c" +#line 8134 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = _candidate_it; @@ -8153,7 +8154,7 @@ 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 8155 "LibraryMonitor.c" +#line 8156 "LibraryMonitor.c" Monitorable* _tmp17_; Monitorable* _tmp18_; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8168,19 +8169,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 8170 "LibraryMonitor.c" +#line 8171 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8174 "LibraryMonitor.c" +#line 8175 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8178 "LibraryMonitor.c" +#line 8179 "LibraryMonitor.c" } #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); -#line 8182 "LibraryMonitor.c" +#line 8183 "LibraryMonitor.c" } @@ -8191,7 +8192,7 @@ static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRunt ((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 8193 "LibraryMonitor.c" +#line 8194 "LibraryMonitor.c" } @@ -8200,7 +8201,7 @@ 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 8202 "LibraryMonitor.c" +#line 8203 "LibraryMonitor.c" } @@ -8218,7 +8219,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 8220 "LibraryMonitor.c" +#line 8221 "LibraryMonitor.c" } @@ -8264,21 +8265,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 8266 "LibraryMonitor.c" +#line 8267 "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 8273 "LibraryMonitor.c" +#line 8274 "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 8280 "LibraryMonitor.c" +#line 8281 "LibraryMonitor.c" } @@ -8287,7 +8288,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 8289 "LibraryMonitor.c" +#line 8290 "LibraryMonitor.c" } } @@ -8297,11 +8298,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 8299 "LibraryMonitor.c" +#line 8300 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 8303 "LibraryMonitor.c" +#line 8304 "LibraryMonitor.c" } } @@ -8309,37 +8310,37 @@ 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 8311 "LibraryMonitor.c" +#line 8312 "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 8318 "LibraryMonitor.c" +#line 8319 "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 8325 "LibraryMonitor.c" +#line 8326 "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 8329 "LibraryMonitor.c" +#line 8330 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_verify_job_ref (object); -#line 8333 "LibraryMonitor.c" +#line 8334 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8337 "LibraryMonitor.c" +#line 8338 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8341 "LibraryMonitor.c" +#line 8342 "LibraryMonitor.c" } @@ -8350,25 +8351,25 @@ static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value, 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 8352 "LibraryMonitor.c" +#line 8353 "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 8358 "LibraryMonitor.c" +#line 8359 "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 8362 "LibraryMonitor.c" +#line 8363 "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 8366 "LibraryMonitor.c" +#line 8367 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8370 "LibraryMonitor.c" +#line 8371 "LibraryMonitor.c" } @@ -8382,7 +8383,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 8384 "LibraryMonitor.c" +#line 8385 "LibraryMonitor.c" } @@ -8391,7 +8392,7 @@ 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 8393 "LibraryMonitor.c" +#line 8394 "LibraryMonitor.c" } @@ -8411,17 +8412,17 @@ 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 8413 "LibraryMonitor.c" +#line 8414 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8417 "LibraryMonitor.c" +#line 8418 "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 8423 "LibraryMonitor.c" +#line 8424 "LibraryMonitor.c" } } @@ -8440,17 +8441,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 8442 "LibraryMonitor.c" +#line 8443 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8446 "LibraryMonitor.c" +#line 8447 "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 8452 "LibraryMonitor.c" +#line 8453 "LibraryMonitor.c" } } @@ -8460,14 +8461,14 @@ 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 8462 "LibraryMonitor.c" +#line 8463 "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 8469 "LibraryMonitor.c" +#line 8470 "LibraryMonitor.c" } @@ -8481,7 +8482,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 8483 "LibraryMonitor.c" +#line 8484 "LibraryMonitor.c" } @@ -8506,7 +8507,7 @@ static gpointer library_monitor_verify_job_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return instance; -#line 8508 "LibraryMonitor.c" +#line 8509 "LibraryMonitor.c" } @@ -8519,7 +8520,7 @@ 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 8521 "LibraryMonitor.c" +#line 8522 "LibraryMonitor.c" } } @@ -8569,7 +8570,7 @@ 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 8571 "LibraryMonitor.c" +#line 8572 "LibraryMonitor.c" } @@ -8638,7 +8639,7 @@ 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 8640 "LibraryMonitor.c" +#line 8641 "LibraryMonitor.c" } @@ -8683,7 +8684,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 8685 "LibraryMonitor.c" +#line 8686 "LibraryMonitor.c" } -- cgit v1.2.3 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/LibraryMonitor.c | 6311 +++++++++++++++++++++++++------------------------- 1 file changed, 3205 insertions(+), 3106 deletions(-) (limited to 'src/LibraryMonitor.c') diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c index 123f726..572b37b 100644 --- a/src/LibraryMonitor.c +++ b/src/LibraryMonitor.c @@ -1,4 +1,4 @@ -/* LibraryMonitor.c generated by valac 0.36.6, the Vala compiler +/* LibraryMonitor.c generated by valac 0.40.4, the Vala compiler * generated from LibraryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -27,6 +27,7 @@ /* situation (since that's a likely case).*/ /**/ + #include #include #include @@ -73,9 +74,9 @@ typedef struct _ParamSpecLibraryMonitorPool ParamSpecLibraryMonitorPool; enum { LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL, LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL, - LIBRARY_MONITOR_POOL_LAST_SIGNAL + LIBRARY_MONITOR_POOL_NUM_SIGNALS }; -static guint library_monitor_pool_signals[LIBRARY_MONITOR_POOL_LAST_SIGNAL] = {0}; +static guint library_monitor_pool_signals[LIBRARY_MONITOR_POOL_NUM_SIGNALS] = {0}; typedef struct _DirectoryMonitorPrivate DirectoryMonitorPrivate; typedef struct _LibraryMonitorPrivate LibraryMonitorPrivate; @@ -176,6 +177,11 @@ typedef struct _BatchImportRollClass BatchImportRollClass; typedef struct _LibraryMonitorVerifyJob LibraryMonitorVerifyJob; typedef struct _LibraryMonitorVerifyJobClass LibraryMonitorVerifyJobClass; +enum { + LIBRARY_MONITOR_0_PROPERTY, + LIBRARY_MONITOR_NUM_PROPERTIES +}; +static GParamSpec* library_monitor_properties[LIBRARY_MONITOR_NUM_PROPERTIES]; #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) @@ -449,9 +455,9 @@ enum { LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL, LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL, LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL, - LIBRARY_MONITOR_LAST_SIGNAL + LIBRARY_MONITOR_NUM_SIGNALS }; -static guint library_monitor_signals[LIBRARY_MONITOR_LAST_SIGNAL] = {0}; +static guint library_monitor_signals[LIBRARY_MONITOR_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -595,68 +601,67 @@ struct _LibraryMonitorAsyncDiscoveryCompletedData { GeeHashSet* _tmp5_; GeeIterator* _tmp6_; GeeIterator* _tmp7_; - gboolean _tmp8_; GFile* file; - GeeIterator* _tmp9_; - gpointer _tmp10_; + GeeIterator* _tmp8_; + gpointer _tmp9_; GFileInfo* info; - GFile* _tmp11_; + GFile* _tmp10_; + GFileInfo* _tmp11_; GFileInfo* _tmp12_; - GFileInfo* _tmp13_; - GeeArrayList* _tmp14_; + GeeArrayList* _tmp13_; GeeCollection* candidates; gboolean associated; GeeList* _monitor_list; + GeeList* _tmp14_; GeeList* _tmp15_; - GeeList* _tmp16_; gint _monitor_size; - GeeList* _tmp17_; + GeeList* _tmp16_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; gint _monitor_index; + gint _tmp19_; gint _tmp20_; gint _tmp21_; - gint _tmp22_; MediaMonitor* monitor; - GeeList* _tmp23_; - gint _tmp24_; - gpointer _tmp25_; + GeeList* _tmp22_; + gint _tmp23_; + gpointer _tmp24_; MediaMonitorDiscoveredFile _result_; - MediaMonitor* _tmp26_; - GFile* _tmp27_; - GFileInfo* _tmp28_; - MediaMonitorDiscoveredFile _tmp29_; - GeeCollection* _tmp30_; - gboolean _tmp31_; + MediaMonitor* _tmp25_; + GFile* _tmp26_; + GFileInfo* _tmp27_; + MediaMonitorDiscoveredFile _tmp28_; + GeeCollection* _tmp29_; + gboolean _tmp30_; + MediaMonitorDiscoveredFile _tmp31_; MediaMonitorDiscoveredFile _tmp32_; - MediaMonitorDiscoveredFile _tmp33_; - GeeCollection* _tmp34_; - GeeArrayList* _tmp35_; - GeeCollection* _tmp36_; - gboolean _tmp37_; - GeeArrayList* _tmp38_; - GFile* _tmp39_; - GeeArrayList* _tmp40_; + GeeCollection* _tmp33_; + GeeArrayList* _tmp34_; + GeeCollection* _tmp35_; + gboolean _tmp36_; + GeeArrayList* _tmp37_; + GFile* _tmp38_; + GeeArrayList* _tmp39_; + gint _tmp40_; gint _tmp41_; - gint _tmp42_; GeeArrayList* job_candidates; + GeeArrayList* _tmp42_; GeeArrayList* _tmp43_; GeeArrayList* _tmp44_; - GeeArrayList* _tmp45_; - gint _tmp46_; - Workers* _tmp47_; - GFile* _tmp48_; - GeeArrayList* _tmp49_; + gint _tmp45_; + Workers* _tmp46_; + GFile* _tmp47_; + GeeArrayList* _tmp48_; + LibraryMonitorFindMoveJob* _tmp49_; LibraryMonitorFindMoveJob* _tmp50_; - LibraryMonitorFindMoveJob* _tmp51_; - GeeHashSet* _tmp52_; - GeeArrayList* _tmp53_; + GeeHashSet* _tmp51_; + GeeArrayList* _tmp52_; + gint _tmp53_; gint _tmp54_; - gint _tmp55_; + gchar* _tmp55_; gchar* _tmp56_; - gchar* _tmp57_; + gint _tmp57_; gint _tmp58_; - gint _tmp59_; }; typedef enum { @@ -723,77 +728,61 @@ struct _LibraryMonitorVerifyMonitorableData { gint _files_size_; GFile** _tmp1_; gint _tmp1__length1; - MediaMonitor* _tmp2_; - Monitorable* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; + GFile* _tmp2_; + GFile* _tmp3_; GFile** aux_files; - MediaMonitor* _tmp6_; - Monitorable* _tmp7_; - gint _tmp8_; - GFile** _tmp9_; + gint _tmp4_; + GFile** _tmp5_; gint aux_files_length1; gint _aux_files_size_; - GFile** _tmp10_; - gint _tmp10__length1; - GFile** _tmp11_; - gint _tmp11__length1; + GFile** _tmp6_; + gint _tmp6__length1; + GFile** _tmp7_; + gint _tmp7__length1; GFile** aux_file_collection; gint aux_file_collection_length1; gint _aux_file_collection_size_; gint aux_file_it; - GFile* _tmp12_; + GFile* _tmp8_; GFile* aux_file; - GFile** _tmp13_; - gint _tmp13__length1; - GFile* _tmp14_; - GFile* _tmp15_; + GFile** _tmp9_; + gint _tmp9__length1; + GFile* _tmp10_; + GFile* _tmp11_; gint ctr; - gboolean _tmp16_; - gint _tmp17_; - gint _tmp18_; - GFile** _tmp19_; - gint _tmp19__length1; + gboolean _tmp12_; + gint _tmp13_; + gint _tmp14_; + GFile** _tmp15_; + gint _tmp15__length1; GFile* file; - GFile** _tmp20_; - gint _tmp20__length1; - gint _tmp21_; - GFile* _tmp22_; - GFile* _tmp23_; + GFile** _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; GFileInfo* info; + GFile* _tmp20_; + GFileInfo* _tmp21_; + GFileInfo* _tmp22_; + GFileInfo* _tmp23_; GFile* _tmp24_; - GFileInfo* _tmp25_; + GCancellable* _tmp25_; GFileInfo* _tmp26_; GFileInfo* _tmp27_; - GFile* _tmp28_; - GCancellable* _tmp29_; - GFileInfo* _tmp30_; - GFileInfo* _tmp31_; GError* err; - gint _tmp32_; - gboolean _tmp33_; + gint _tmp28_; + gboolean _tmp29_; + GFileInfo* _tmp30_; + gboolean _tmp31_; + GFileInfo* _tmp32_; + GFile* _tmp33_; GFileInfo* _tmp34_; - MediaMonitor* _tmp35_; - Monitorable* _tmp36_; - gboolean _tmp37_; - MediaMonitor* _tmp38_; - Monitorable* _tmp39_; - gboolean _tmp40_; - GFileInfo* _tmp41_; - MediaMonitor* _tmp42_; - Monitorable* _tmp43_; - gboolean _tmp44_; - MediaMonitor* _tmp45_; - Monitorable* _tmp46_; - MediaMonitor* _tmp47_; - Monitorable* _tmp48_; - GFile* _tmp49_; - GFileInfo* _tmp50_; - gint _tmp51_; - gint _tmp52_; - gint _tmp53_; - gint _tmp54_; - gint _tmp55_; + gint _tmp35_; + gint _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; GError * _inner_error_; }; @@ -907,17 +896,20 @@ static gpointer library_monitor_verify_job_parent_class = NULL; gpointer library_monitor_pool_ref (gpointer instance); void library_monitor_pool_unref (gpointer instance); -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_library_monitor_pool (GValue* value, gpointer v_object); -void value_take_library_monitor_pool (GValue* value, gpointer v_object); +GParamSpec* param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_library_monitor_pool (GValue* value, + gpointer v_object); +void value_take_library_monitor_pool (GValue* value, + gpointer v_object); gpointer value_get_library_monitor_pool (const GValue* value); GType library_monitor_pool_get_type (void) G_GNUC_CONST; GType directory_monitor_get_type (void) G_GNUC_CONST; GType library_monitor_get_type (void) G_GNUC_CONST; #define LIBRARY_MONITOR_POOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_MONITOR_POOL, LibraryMonitorPoolPrivate)) -enum { - LIBRARY_MONITOR_POOL_DUMMY_PROPERTY -}; static LibraryMonitorPool* library_monitor_pool_new (void); static LibraryMonitorPool* library_monitor_pool_construct (GType object_type); void library_monitor_pool_init (void); @@ -925,7 +917,9 @@ void library_monitor_pool_terminate (void); static void library_monitor_pool_close (LibraryMonitorPool* self); LibraryMonitorPool* library_monitor_pool_get_instance (void); LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self); -void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay); +void library_monitor_pool_replace (LibraryMonitorPool* self, + LibraryMonitor* replacement, + gint start_msec_delay); 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); @@ -933,9 +927,15 @@ void directory_monitor_start_discovery (DirectoryMonitor* self); 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); -void value_set_workers (GValue* value, gpointer v_object); -void value_take_workers (GValue* value, gpointer v_object); +GParamSpec* param_spec_workers (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_workers (GValue* value, + gpointer v_object); +void value_take_workers (GValue* value, + gpointer v_object); gpointer value_get_workers (const GValue* value); GType workers_get_type (void) G_GNUC_CONST; GType media_monitor_get_type (void) G_GNUC_CONST; @@ -947,338 +947,630 @@ GType monitorable_get_type (void) G_GNUC_CONST; GType batch_import_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; static gpointer library_monitor_verify_job_ref (gpointer instance); static void library_monitor_verify_job_unref (gpointer instance); -static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void library_monitor_value_set_verify_job (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void library_monitor_value_take_verify_job (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void library_monitor_value_set_verify_job (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void library_monitor_value_take_verify_job (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer library_monitor_value_get_verify_job (const GValue* value) G_GNUC_UNUSED; static GType library_monitor_verify_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define LIBRARY_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_MONITOR, LibraryMonitorPrivate)) -enum { - LIBRARY_MONITOR_DUMMY_PROPERTY -}; GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void library_monitor_on_config_changed (LibraryMonitor* self); -static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self); +static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, + gpointer self); guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); gpointer timed_queue_ref (gpointer instance); void timed_queue_unref (gpointer instance); -GParamSpec* param_spec_timed_queue (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_timed_queue (GValue* value, gpointer v_object); -void value_take_timed_queue (GValue* value, gpointer v_object); +GParamSpec* param_spec_timed_queue (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_timed_queue (GValue* value, + gpointer v_object); +void value_take_timed_queue (GValue* value, + gpointer v_object); gpointer value_get_timed_queue (const GValue* value); GType timed_queue_get_type (void) G_GNUC_CONST; GType hash_timed_queue_get_type (void) G_GNUC_CONST; #define LIBRARY_MONITOR_MIN_BLACKLIST_DURATION_MSEC (5 * 1000) static void library_monitor_on_unblacklist_file (GFile* file); -static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self); -HashTimedQueue* hash_timed_queue_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); -HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint hold_msec, DequeuedCallback callback, void* callback_target, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify, gint priority); +static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, + gpointer self); +HashTimedQueue* hash_timed_queue_new (GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); +HashTimedQueue* hash_timed_queue_construct (GType object_type, + GType g_type, + GBoxedCopyFunc g_dup_func, + GDestroyNotify g_destroy_func, + guint hold_msec, + DequeuedCallback callback, + void* callback_target, + GeeHashDataFunc hash_func, + void* hash_func_target, + GDestroyNotify hash_func_target_destroy_notify, + GeeEqualDataFunc equal_func, + void* equal_func_target, + GDestroyNotify equal_func_target_destroy_notify, + gint priority); guint workers_thread_per_cpu_minus_one (void); -Workers* workers_new (guint max_threads, gboolean exclusive); -Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive); +Workers* workers_new (guint max_threads, + gboolean exclusive); +Workers* workers_construct (GType object_type, + guint max_threads, + gboolean exclusive); #define LIBRARY_MONITOR_FLUSH_IMPORT_QUEUE_SEC 3 #define LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC (5 * 60) #define LIBRARY_MONITOR_MAX_VERIFY_EXISTING_MEDIA_JOBS 5 -LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); +LibraryMonitor* library_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +LibraryMonitor* library_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self); static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self); static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer self); static void library_monitor_real_close (DirectoryMonitor* base); void media_monitor_close (MediaMonitor* self); -static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaMonitor* monitor, Monitorable* monitorable); -static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, Monitorable* monitorable); +static void library_monitor_add_to_discovered_list (LibraryMonitor* self, + MediaMonitor* monitor, + Monitorable* monitorable); +static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, + Monitorable* monitorable); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; MediaSourceCollection* media_monitor_get_media_source_collection (MediaMonitor* self); -gboolean source_collection_holds_type_of_source (SourceCollection* self, DataSource* source); +gboolean source_collection_holds_type_of_source (SourceCollection* self, + DataSource* source); gchar* data_object_to_string (DataObject* self); static void library_monitor_real_discovery_started (DirectoryMonitor* base); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); -MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable); +MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, + Workers* workers, + GCancellable* cancellable); void media_monitor_notify_discovery_started (MediaMonitor* self); -static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* file, GFileInfo* info); +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); +gboolean tombstone_source_collection_matches (TombstoneSourceCollection* self, + GFile* file); +static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, + GFile* file); 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 (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 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); -GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); +GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, + GFile* file); +GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, + GFile* file, + GFileInfo* info, + MediaMonitorDiscoveredFile* _result_); gpointer background_job_ref (gpointer instance); void background_job_unref (gpointer instance); -GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_background_job (GValue* value, gpointer v_object); -void value_take_background_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_background_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_background_job (GValue* value, + gpointer v_object); +void value_take_background_job (GValue* value, + gpointer v_object); gpointer value_get_background_job (const GValue* value); GType background_job_get_type (void) G_GNUC_CONST; -void workers_enqueue (Workers* self, BackgroundJob* job); -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates); -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates); +void workers_enqueue (Workers* self, + BackgroundJob* job); +static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); +static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); static GType library_monitor_find_move_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpointer self); void directory_monitor_mdbg (const gchar* msg); static void library_monitor_report_checksum_job_completed (LibraryMonitor* self); -static void library_monitor_on_find_move_completed (LibraryMonitor* self, BackgroundJob* j); +static void library_monitor_on_find_move_completed (LibraryMonitor* self, + BackgroundJob* j); GType background_job_job_priority_get_type (void) G_GNUC_CONST; -void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file); -static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, BackgroundJob* j); -static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor); +void media_monitor_update_master_file (MediaMonitor* self, + Monitorable* monitorable, + GFile* file); +static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, + BackgroundJob* j); +static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor); GeeCollection* data_collection_get_all (DataCollection* self); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self); GeeCollection* source_holding_tank_get_all (SourceHoldingTank* self); -static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollection* files); -void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, DirectoryMonitor* monitor, GCancellable* cancellable); -static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor); -static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, Monitorable* monitorable, MediaMonitor* monitor); +static void library_monitor_enqueue_import_many (LibraryMonitor* self, + GeeCollection* files); +void tombstone_source_collection_launch_scan (TombstoneSourceCollection* self, + DirectoryMonitor* monitor, + GCancellable* cancellable); +static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, + MediaMonitor* monitor); +static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType object_type, + Monitorable* monitorable, + MediaMonitor* monitor); 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 (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 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_add131 (GFile** * array, int* length, int* size, GFile* value); +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_add131 (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 #define DIRECTORY_MONITOR_DEFAULT_PRIORITY G_PRIORITY_LOW -static void library_monitor_verify_monitorable_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable); -void media_monitor_update_backing_file_info (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); +static void library_monitor_verify_monitorable_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_); +gboolean media_monitor_is_offline (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_online (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_offline (MediaMonitor* self, + Monitorable* monitorable); +void media_monitor_update_backing_file_info (MediaMonitor* self, + Monitorable* monitorable, + GFile* file, + GFileInfo* info); static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer self); static void library_monitor_import_unrepresented_files (LibraryMonitor* self); static void library_monitor_cancel_batch_imports (LibraryMonitor* self); -static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file); +static void library_monitor_enqueue_import (LibraryMonitor* self, + GFile* file); gboolean library_monitor_is_blacklisted (GFile* file); -static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* file); +static void library_monitor_remove_queued_import (LibraryMonitor* self, + GFile* file); gulong now_sec (void); BatchImportRoll* batch_import_roll_new (void); BatchImportRoll* batch_import_roll_construct (GType object_type); gpointer batch_import_job_ref (gpointer instance); void batch_import_job_unref (gpointer instance); -GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_job (GValue* value, gpointer v_object); -void value_take_batch_import_job (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_job (GValue* value, + gpointer v_object); +void value_take_batch_import_job (GValue* value, + gpointer v_object); gpointer value_get_batch_import_job (const GValue* value); GType batch_import_job_get_type (void) G_GNUC_CONST; -FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); -FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse); +FileImportJob* file_import_job_new (GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); +FileImportJob* file_import_job_construct (GType object_type, + GFile* file_or_dir, + gboolean copy_to_library, + gboolean recurse); GType file_import_job_get_type (void) G_GNUC_CONST; gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; -BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest); -void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates); -void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online); +BatchImport* batch_import_new (GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +BatchImport* batch_import_construct (GType object_type, + GeeIterable* jobs, + const gchar* name, + BatchImportImportReporter reporter, + void* reporter_target, + GeeArrayList* prefailed, + GeeArrayList* pre_already_imported, + GCancellable* cancellable, + BatchImportRoll* import_roll, + ImportManifest* skip_manifest); +void batch_import_set_untrash_duplicates (BatchImport* self, + gboolean untrash_duplicates); +void batch_import_set_mark_duplicates_online (BatchImport* self, + gboolean mark_duplicates_online); static void library_monitor_schedule_next_batch_import (LibraryMonitor* self); static void library_monitor_on_import_preparing (LibraryMonitor* self); -static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self); -static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 completed_bytes, guint64 total_bytes); -static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self); -static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll); -static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); +static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self); +static void library_monitor_on_import_progress (LibraryMonitor* self, + guint64 completed_bytes, + guint64 total_bytes); +static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self); +static void library_monitor_on_import_complete (LibraryMonitor* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll); +static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); void batch_import_schedule (BatchImport* self); static void library_monitor_discard_current_batch_import (LibraryMonitor* self); void batch_import_user_halt (BatchImport* self); gpointer batch_import_result_ref (gpointer instance); void batch_import_result_unref (gpointer instance); -GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_result (GValue* value, gpointer v_object); -void value_take_batch_import_result (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_result (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_result (GValue* value, + gpointer v_object); +void value_take_batch_import_result (GValue* value, + gpointer v_object); gpointer value_get_batch_import_result (const GValue* value); GType batch_import_result_get_type (void) G_GNUC_CONST; GType import_result_get_type (void) G_GNUC_CONST; GType duplicated_file_get_type (void) G_GNUC_CONST; gpointer tombstoned_file_ref (gpointer instance); void tombstoned_file_unref (gpointer instance); -GParamSpec* param_spec_tombstoned_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_tombstoned_file (GValue* value, gpointer v_object); -void value_take_tombstoned_file (GValue* value, gpointer v_object); +GParamSpec* param_spec_tombstoned_file (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_tombstoned_file (GValue* value, + gpointer v_object); +void value_take_tombstoned_file (GValue* value, + gpointer v_object); gpointer value_get_tombstoned_file (const GValue* value); GType tombstoned_file_get_type (void) G_GNUC_CONST; -TombstonedFile* tombstoned_file_new (GFile* file, gint64 filesize, const gchar* md5); -TombstonedFile* tombstoned_file_construct (GType object_type, GFile* file, gint64 filesize, const gchar* md5); +TombstonedFile* tombstoned_file_new (GFile* file, + gint64 filesize, + const gchar* md5); +TombstonedFile* tombstoned_file_construct (GType object_type, + GFile* file, + gint64 filesize, + const gchar* md5); GType tombstone_reason_get_type (void) G_GNUC_CONST; GQuark database_error_quark (void); -void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason, GError** error); +void tombstone_entomb_many_files (GeeCollection* files, + TombstoneReason reason, + GError** error); void app_window_database_error (GError* err); -void library_monitor_blacklist_file (GFile* file, const gchar* reason); +void library_monitor_blacklist_file (GFile* file, + const gchar* reason); void library_monitor_unblacklist_file (GFile* file); -gboolean timed_queue_contains (TimedQueue* self, gconstpointer item); -gboolean timed_queue_enqueue (TimedQueue* self, gconstpointer item); -MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file); +gboolean timed_queue_contains (TimedQueue* self, + gconstpointer item); +gboolean timed_queue_enqueue (TimedQueue* self, + gconstpointer item); +MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, + GFile* file); GeeCollection* directory_monitor_get_files (DirectoryMonitor* self); -gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file); -static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, GFile* file); -static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info); +gboolean media_monitor_is_file_represented (MediaMonitor* self, + GFile* file); +static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, + GFile* file); +static void library_monitor_real_notify_file_created (DirectoryMonitor* base, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_created (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_created (MediaMonitor* self, + GFile* file, + GFileInfo* info); gchar* media_monitor_to_string (MediaMonitor* self); const gchar* media_monitor_discovered_file_to_string (MediaMonitorDiscoveredFile self); -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates); -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates); +static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); +static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates); static GType library_monitor_runtime_find_move_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, BackgroundJob* j); -static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_info); -void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); -static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GFile* file); -void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file); -gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file); -static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, GFile* file); -void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file); -gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile* file); -static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, GFile* file, GFileInfo* info); -void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info); -gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info); -static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GFile* file); -void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file); -gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file); +static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, + BackgroundJob* j); +static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, + GFile* old_file, + GFile* new_file, + GFileInfo* new_info); +void directory_monitor_notify_file_moved (DirectoryMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +gboolean media_monitor_notify_file_moved (MediaMonitor* self, + GFile* old_file, + GFile* new_file, + GFileInfo* new_file_info); +static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, + GFile* file); +void directory_monitor_notify_file_altered (DirectoryMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_altered (MediaMonitor* self, + GFile* file); +static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, + GFile* file); +void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, + GFile* file); +static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, + GFile* file, + GFileInfo* info); +void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, + GFile* file, + GFileInfo* info); +gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, + GFile* file, + GFileInfo* info); +static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, + GFile* file); +void directory_monitor_notify_file_deleted (DirectoryMonitor* self, + GFile* file); +gboolean media_monitor_notify_file_deleted (MediaMonitor* self, + GFile* file); GType tombstone_get_type (void) G_GNUC_CONST; -Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file); -void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone); -static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -enum { - LIBRARY_MONITOR_FIND_MOVE_JOB_DUMMY_PROPERTY -}; -static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self); -static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self); +Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, + GFile* file); +void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, + Tombstone* tombstone); +static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, + gpointer self); +static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, + gpointer self); gpointer abstract_semaphore_ref (gpointer instance); void abstract_semaphore_unref (gpointer instance); -GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_abstract_semaphore (GValue* value, gpointer v_object); -void value_take_abstract_semaphore (GValue* value, gpointer v_object); +GParamSpec* param_spec_abstract_semaphore (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_abstract_semaphore (GValue* value, + gpointer v_object); +void value_take_abstract_semaphore (GValue* value, + gpointer v_object); gpointer value_get_abstract_semaphore (const GValue* value); GType abstract_semaphore_get_type (void) G_GNUC_CONST; -BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore); -void background_job_set_completion_priority (BackgroundJob* self, gint priority); +BackgroundJob* background_job_construct (GType object_type, + GObject* owner, + CompletionCallback callback, + void* callback_target, + GCancellable* cancellable, + CancellationCallback cancellation, + void* cancellation_target, + AbstractSemaphore* completion_semaphore); +void background_job_set_completion_priority (BackgroundJob* self, + gint priority); 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* md5_file (GFile* file, + GError** error); gchar* media_source_get_master_md5 (MediaSource* self); 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_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); -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 _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -static LibraryMonitorPool* library_monitor_pool_construct (GType object_type) { +static LibraryMonitorPool* +library_monitor_pool_construct (GType object_type) +{ LibraryMonitorPool* self = NULL; #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = (LibraryMonitorPool*) g_type_create_instance (object_type); #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 1238 "LibraryMonitor.c" +#line 1520 "LibraryMonitor.c" } -static LibraryMonitorPool* library_monitor_pool_new (void) { +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 1245 "LibraryMonitor.c" +#line 1529 "LibraryMonitor.c" } -void library_monitor_pool_init (void) { +void +library_monitor_pool_init (void) +{ } -void library_monitor_pool_terminate (void) { +void +library_monitor_pool_terminate (void) +{ 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 1259 "LibraryMonitor.c" +#line 1547 "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 1265 "LibraryMonitor.c" +#line 1553 "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 1271 "LibraryMonitor.c" +#line 1559 "LibraryMonitor.c" } -static gpointer _library_monitor_pool_ref0 (gpointer self) { +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 1278 "LibraryMonitor.c" +#line 1568 "LibraryMonitor.c" } -LibraryMonitorPool* library_monitor_pool_get_instance (void) { +LibraryMonitorPool* +library_monitor_pool_get_instance (void) +{ LibraryMonitorPool* result = NULL; LibraryMonitorPool* _tmp0_; LibraryMonitorPool* _tmp2_; @@ -1287,7 +1579,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { _tmp0_ = library_monitor_pool_instance; #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_ == NULL) { -#line 1291 "LibraryMonitor.c" +#line 1583 "LibraryMonitor.c" LibraryMonitorPool* _tmp1_; #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = library_monitor_pool_new (); @@ -1295,7 +1587,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { _library_monitor_pool_unref0 (library_monitor_pool_instance); #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_instance = _tmp1_; -#line 1299 "LibraryMonitor.c" +#line 1591 "LibraryMonitor.c" } #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = library_monitor_pool_instance; @@ -1305,18 +1597,22 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) { result = _tmp3_; #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1309 "LibraryMonitor.c" +#line 1601 "LibraryMonitor.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 1316 "LibraryMonitor.c" +#line 1610 "LibraryMonitor.c" } -LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { +LibraryMonitor* +library_monitor_pool_get_monitor (LibraryMonitorPool* self) +{ LibraryMonitor* result = NULL; LibraryMonitor* _tmp0_; LibraryMonitor* _tmp1_; @@ -1330,25 +1626,29 @@ LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) { result = _tmp1_; #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1334 "LibraryMonitor.c" +#line 1630 "LibraryMonitor.c" } -static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer self) { +static gboolean +_library_monitor_pool_on_start_monitor_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_pool_on_start_monitor ((LibraryMonitorPool*) self); #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1343 "LibraryMonitor.c" +#line 1641 "LibraryMonitor.c" } -void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* replacement, gint start_msec_delay) { +void +library_monitor_pool_replace (LibraryMonitorPool* self, + LibraryMonitor* replacement, + gint start_msec_delay) +{ LibraryMonitor* _tmp0_; - LibraryMonitor* _tmp1_; - gboolean _tmp2_ = FALSE; - gint _tmp3_; - LibraryMonitor* _tmp7_; + gboolean _tmp1_ = FALSE; + LibraryMonitor* _tmp3_; #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" @@ -1356,51 +1656,42 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep #line 64 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_close (self); #line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = replacement; -#line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (replacement); #line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->monitor); #line 66 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->monitor = _tmp1_; + self->priv->monitor = _tmp0_; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = start_msec_delay; + if (start_msec_delay > 0) { +#line 1667 "LibraryMonitor.c" + guint _tmp2_; #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp3_ > 0) { -#line 1371 "LibraryMonitor.c" - guint _tmp4_; + _tmp2_ = self->priv->timer_id; #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 1377 "LibraryMonitor.c" + _tmp1_ = _tmp2_ == ((guint) 0); +#line 1673 "LibraryMonitor.c" } else { #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = FALSE; -#line 1381 "LibraryMonitor.c" + _tmp1_ = FALSE; +#line 1677 "LibraryMonitor.c" } #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp2_) { -#line 1385 "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); + if (_tmp1_) { #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->timer_id = _tmp6_; -#line 1394 "LibraryMonitor.c" + self->priv->timer_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) start_msec_delay, _library_monitor_pool_on_start_monitor_gsource_func, library_monitor_pool_ref (self), library_monitor_pool_unref); +#line 1683 "LibraryMonitor.c" } #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->monitor; + _tmp3_ = self->priv->monitor; #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp7_); -#line 1400 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp3_); +#line 1689 "LibraryMonitor.c" } -static void library_monitor_pool_close (LibraryMonitorPool* self) { +static void +library_monitor_pool_close (LibraryMonitorPool* self) +{ LibraryMonitor* _tmp0_; LibraryMonitor* _tmp1_; LibraryMonitor* closed = NULL; @@ -1415,7 +1706,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { if (_tmp0_ == NULL) { #line 75 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 1419 "LibraryMonitor.c" +#line 1710 "LibraryMonitor.c" } #line 77 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1437,11 +1728,13 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) { 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 1441 "LibraryMonitor.c" +#line 1732 "LibraryMonitor.c" } -static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) { +static gboolean +library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) +{ gboolean result = FALSE; LibraryMonitor* _tmp0_; LibraryMonitor* _tmp1_; @@ -1457,7 +1750,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 1461 "LibraryMonitor.c" +#line 1754 "LibraryMonitor.c" } #line 91 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = self->priv->monitor; @@ -1467,108 +1760,133 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self) result = FALSE; #line 93 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1471 "LibraryMonitor.c" +#line 1764 "LibraryMonitor.c" } -static void value_library_monitor_pool_init (GValue* value) { +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 1478 "LibraryMonitor.c" +#line 1773 "LibraryMonitor.c" } -static void value_library_monitor_pool_free_value (GValue* value) { +static void +value_library_monitor_pool_free_value (GValue* value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 1487 "LibraryMonitor.c" +#line 1784 "LibraryMonitor.c" } } -static void value_library_monitor_pool_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_library_monitor_pool_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 1497 "LibraryMonitor.c" +#line 1797 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 1501 "LibraryMonitor.c" +#line 1801 "LibraryMonitor.c" } } -static gpointer value_library_monitor_pool_peek_pointer (const GValue* value) { +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 1509 "LibraryMonitor.c" +#line 1811 "LibraryMonitor.c" } -static gchar* value_library_monitor_pool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1516 "LibraryMonitor.c" +#line 1823 "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 1523 "LibraryMonitor.c" +#line 1830 "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 1527 "LibraryMonitor.c" +#line 1834 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_pool_ref (object); -#line 1531 "LibraryMonitor.c" +#line 1838 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1535 "LibraryMonitor.c" +#line 1842 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1539 "LibraryMonitor.c" +#line 1846 "LibraryMonitor.c" } -static gchar* value_library_monitor_pool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_library_monitor_pool_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ 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 1550 "LibraryMonitor.c" +#line 1862 "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 1556 "LibraryMonitor.c" +#line 1868 "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 1560 "LibraryMonitor.c" +#line 1872 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" *object_p = library_monitor_pool_ref (value->data[0].v_pointer); -#line 1564 "LibraryMonitor.c" +#line 1876 "LibraryMonitor.c" } #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 1568 "LibraryMonitor.c" +#line 1880 "LibraryMonitor.c" } -GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_library_monitor_pool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecLibraryMonitorPool* spec; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_LIBRARY_MONITOR_POOL), NULL); @@ -1578,20 +1896,25 @@ 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 1582 "LibraryMonitor.c" +#line 1900 "LibraryMonitor.c" } -gpointer value_get_library_monitor_pool (const GValue* value) { +gpointer +value_get_library_monitor_pool (const GValue* value) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 1591 "LibraryMonitor.c" +#line 1911 "LibraryMonitor.c" } -void value_set_library_monitor_pool (GValue* value, gpointer v_object) { +void +value_set_library_monitor_pool (GValue* value, + gpointer v_object) +{ 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)); @@ -1607,22 +1930,25 @@ 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 1611 "LibraryMonitor.c" +#line 1934 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1615 "LibraryMonitor.c" +#line 1938 "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 1621 "LibraryMonitor.c" +#line 1944 "LibraryMonitor.c" } } -void value_take_library_monitor_pool (GValue* value, gpointer v_object) { +void +value_take_library_monitor_pool (GValue* value, + gpointer v_object) +{ 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)); @@ -1636,22 +1962,24 @@ 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 1640 "LibraryMonitor.c" +#line 1966 "LibraryMonitor.c" } else { #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 1644 "LibraryMonitor.c" +#line 1970 "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 1650 "LibraryMonitor.c" +#line 1976 "LibraryMonitor.c" } } -static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) { +static void +library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_pool_parent_class = g_type_class_peek_parent (klass); #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1662,11 +1990,13 @@ static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) { 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" 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 1666 "LibraryMonitor.c" +#line 1994 "LibraryMonitor.c" } -static void library_monitor_pool_instance_init (LibraryMonitorPool * self) { +static void +library_monitor_pool_instance_init (LibraryMonitorPool * self) +{ #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv = LIBRARY_MONITOR_POOL_GET_PRIVATE (self); #line 31 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1675,11 +2005,13 @@ 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 1679 "LibraryMonitor.c" +#line 2009 "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); @@ -1687,11 +2019,13 @@ 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 1691 "LibraryMonitor.c" +#line 2023 "LibraryMonitor.c" } -GType library_monitor_pool_get_type (void) { +GType +library_monitor_pool_get_type (void) +{ static volatile gsize library_monitor_pool_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_pool_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_library_monitor_pool_init, value_library_monitor_pool_free_value, value_library_monitor_pool_copy_value, value_library_monitor_pool_peek_pointer, "p", value_library_monitor_pool_collect_value, "p", value_library_monitor_pool_lcopy_value }; @@ -1705,18 +2039,22 @@ GType library_monitor_pool_get_type (void) { } -gpointer library_monitor_pool_ref (gpointer instance) { +gpointer +library_monitor_pool_ref (gpointer instance) +{ 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 1716 "LibraryMonitor.c" +#line 2052 "LibraryMonitor.c" } -void library_monitor_pool_unref (gpointer instance) { +void +library_monitor_pool_unref (gpointer instance) +{ LibraryMonitorPool * self; self = instance; #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -1725,109 +2063,120 @@ 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 1729 "LibraryMonitor.c" +#line 2067 "LibraryMonitor.c" } } -static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self) { +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 1737 "LibraryMonitor.c" +#line 2078 "LibraryMonitor.c" } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1746 "LibraryMonitor.c" +#line 2090 "LibraryMonitor.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1755 "LibraryMonitor.c" +#line 2103 "LibraryMonitor.c" } -static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self) { +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 1762 "LibraryMonitor.c" +#line 2113 "LibraryMonitor.c" } -static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer self) { +static gboolean +_library_monitor_on_flush_import_queue_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_on_flush_import_queue ((LibraryMonitor*) self); #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 1771 "LibraryMonitor.c" +#line 2124 "LibraryMonitor.c" } -LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) { +LibraryMonitor* +library_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring) +{ LibraryMonitor * self = NULL; - GFile* _tmp0_; - gboolean _tmp1_; - gboolean _tmp2_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + ConfigFacade* _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" - _tmp0_ = root; -#line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = recurse; -#line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = monitoring; -#line 237 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self = (LibraryMonitor*) directory_monitor_construct (object_type, _tmp0_, _tmp1_, _tmp2_); + self = (LibraryMonitor*) directory_monitor_construct (object_type, root, recurse, monitoring); #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = config_facade_get_instance (); -#line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp0_ = config_facade_get_instance (); #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = _tmp0_; #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->auto_import = _tmp5_; + self->priv->auto_import = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 240 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp1_); #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = config_facade_get_instance (); + _tmp2_ = config_facade_get_instance (); #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "auto-import-from-library-changed", (GCallback) _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "auto-import-from-library-changed", (GCallback) _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed, self, 0); #line 241 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp7_); -#line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_MONITOR_FLUSH_IMPORT_QUEUE_SEC, _library_monitor_on_flush_import_queue_gsource_func, g_object_ref (self), g_object_unref); + _g_object_unref0 (_tmp3_); #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->import_queue_timer_id = _tmp8_; + self->priv->import_queue_timer_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_MONITOR_FLUSH_IMPORT_QUEUE_SEC, _library_monitor_on_flush_import_queue_gsource_func, g_object_ref (self), g_object_unref); #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 1820 "LibraryMonitor.c" +#line 2163 "LibraryMonitor.c" } -LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) { +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 1827 "LibraryMonitor.c" +#line 2174 "LibraryMonitor.c" } -static void library_monitor_real_close (DirectoryMonitor* base) { +static void +library_monitor_real_close (DirectoryMonitor* base) +{ LibraryMonitor * self; GCancellable* _tmp0_; guint _tmp13_; @@ -1837,7 +2186,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _tmp0_ = self->priv->cancellable; #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 1841 "LibraryMonitor.c" +#line 2190 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp1_; @@ -1865,7 +2214,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { _monitor_index = -1; #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 1869 "LibraryMonitor.c" +#line 2218 "LibraryMonitor.c" gint _tmp6_; gint _tmp7_; gint _tmp8_; @@ -1886,7 +2235,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) { if (!(_tmp7_ < _tmp8_)) { #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 1890 "LibraryMonitor.c" +#line 2239 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp9_ = _monitor_list; @@ -1902,17 +2251,17 @@ 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 1906 "LibraryMonitor.c" +#line 2255 "LibraryMonitor.c" } #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 1910 "LibraryMonitor.c" +#line 2259 "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 1916 "LibraryMonitor.c" +#line 2265 "LibraryMonitor.c" guint _tmp14_; #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp14_ = self->priv->import_queue_timer_id; @@ -1920,23 +2269,23 @@ static void library_monitor_real_close (DirectoryMonitor* base) { g_source_remove (_tmp14_); #line 258 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; -#line 1924 "LibraryMonitor.c" +#line 2273 "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 1928 "LibraryMonitor.c" +#line 2277 "LibraryMonitor.c" } -static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaMonitor* monitor, Monitorable* monitorable) { +static void +library_monitor_add_to_discovered_list (LibraryMonitor* self, + MediaMonitor* monitor, + Monitorable* monitorable) +{ GeeHashMap* _tmp0_; - MediaMonitor* _tmp1_; - gboolean _tmp2_; - GeeHashMap* _tmp7_; - MediaMonitor* _tmp8_; - gpointer _tmp9_; - GeeSet* _tmp10_; - Monitorable* _tmp11_; + GeeHashMap* _tmp4_; + gpointer _tmp5_; + GeeSet* _tmp6_; #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" @@ -1946,58 +2295,49 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->discovered; #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = monitor; -#line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 1955 "LibraryMonitor.c" - GeeHashMap* _tmp3_; - MediaMonitor* _tmp4_; - GeeHashSet* _tmp5_; - GeeHashSet* _tmp6_; + if (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitor)) { +#line 2300 "LibraryMonitor.c" + GeeHashMap* _tmp1_; + GeeHashSet* _tmp2_; + GeeHashSet* _tmp3_; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->discovered; + _tmp1_ = self->priv->discovered; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = monitor; + _tmp2_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); -#line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - 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)); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitor, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet)); #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp6_); -#line 1972 "LibraryMonitor.c" + _g_object_unref0 (_tmp3_); +#line 2314 "LibraryMonitor.c" } #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->discovered; + _tmp4_ = self->priv->discovered; #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = monitor; + _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), monitor); #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); + _tmp6_ = (GeeSet*) _tmp5_; #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = (GeeSet*) _tmp9_; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), monitorable); #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = monitorable; -#line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - 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 1988 "LibraryMonitor.c" + _g_object_unref0 (_tmp6_); +#line 2326 "LibraryMonitor.c" } -static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, Monitorable* monitorable) { +static MediaMonitor* +library_monitor_get_monitor_for_monitorable (LibraryMonitor* self, + Monitorable* monitorable) +{ MediaMonitor* result = NULL; - Monitorable* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + gchar* _tmp15_; + gchar* _tmp16_; #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 2001 "LibraryMonitor.c" +#line 2341 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -2025,7 +2365,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor _monitor_index = -1; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2029 "LibraryMonitor.c" +#line 2369 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -2036,9 +2376,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor MediaMonitor* _tmp11_; MediaSourceCollection* _tmp12_; MediaSourceCollection* _tmp13_; - Monitorable* _tmp14_; - gboolean _tmp15_; - gboolean _tmp16_; + gboolean _tmp14_; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2051,7 +2389,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor if (!(_tmp6_ < _tmp7_)) { #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2055 "LibraryMonitor.c" +#line 2393 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2068,52 +2406,48 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp13_ = _tmp12_; #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitorable; -#line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = source_collection_holds_type_of_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)); -#line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _tmp15_; + _tmp14_ = source_collection_holds_type_of_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_DATA_SOURCE, DataSource)); #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_collection_unref0 (_tmp13_); #line 273 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (_tmp14_) { #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = monitor; #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 2087 "LibraryMonitor.c" +#line 2421 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2091 "LibraryMonitor.c" +#line 2425 "LibraryMonitor.c" } #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2095 "LibraryMonitor.c" +#line 2429 "LibraryMonitor.c" } #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = monitorable; -#line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (monitorable, TYPE_DATA_OBJECT, DataObject)); #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _tmp18_; + _tmp16_ = _tmp15_; #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp19_); + g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp16_); #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp19_); -#line 2107 "LibraryMonitor.c" + _g_free0 (_tmp16_); +#line 2439 "LibraryMonitor.c" } -static void library_monitor_real_discovery_started (DirectoryMonitor* base) { +static void +library_monitor_real_discovery_started (DirectoryMonitor* base) +{ LibraryMonitor * self; - GeeHashMap* _tmp28_; - GeeHashSet* _tmp29_; + GeeHashMap* _tmp27_; + GeeHashSet* _tmp28_; #line 280 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor); -#line 2117 "LibraryMonitor.c" +#line 2451 "LibraryMonitor.c" { GeeIterator* _collection_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -2142,154 +2476,153 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { _collection_it = _tmp5_; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2146 "LibraryMonitor.c" +#line 2480 "LibraryMonitor.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* collection = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - GeeList* _tmp10_; - MediaSourceCollection* _tmp11_; - Workers* _tmp12_; - GCancellable* _tmp13_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeList* _tmp9_; + MediaSourceCollection* _tmp10_; + Workers* _tmp11_; + GCancellable* _tmp12_; + MediaMonitor* _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" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2166 "LibraryMonitor.c" +#line 2497 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _collection_it; + _tmp7_ = _collection_it; #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - collection = (MediaSourceCollection*) _tmp9_; + collection = (MediaSourceCollection*) _tmp8_; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = self->priv->monitors; + _tmp9_ = self->priv->monitors; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = collection; + _tmp10_ = collection; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = self->priv->workers; + _tmp11_ = self->priv->workers; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = self->priv->cancellable; + _tmp12_ = self->priv->cancellable; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = media_source_collection_create_media_monitor (_tmp11_, _tmp12_, _tmp13_); + _tmp13_ = media_source_collection_create_media_monitor (_tmp10_, _tmp11_, _tmp12_); #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_); #line 282 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_collection_unref0 (collection); -#line 2192 "LibraryMonitor.c" +#line 2523 "LibraryMonitor.c" } #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_collection_it); -#line 2196 "LibraryMonitor.c" +#line 2527 "LibraryMonitor.c" } { GeeList* _monitor_list = NULL; + GeeList* _tmp15_; GeeList* _tmp16_; - GeeList* _tmp17_; gint _monitor_size = 0; - GeeList* _tmp18_; + GeeList* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; gint _monitor_index = 0; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = self->priv->monitors; + _tmp15_ = self->priv->monitors; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = _g_object_ref0 (_tmp16_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp17_; + _monitor_list = _tmp16_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _monitor_list; + _tmp17_ = _monitor_list; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection)); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp20_; + _monitor_size = _tmp19_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 2225 "LibraryMonitor.c" +#line 2556 "LibraryMonitor.c" + gint _tmp20_; gint _tmp21_; gint _tmp22_; - gint _tmp23_; MediaMonitor* monitor = NULL; - GeeList* _tmp24_; - gint _tmp25_; - gpointer _tmp26_; - MediaMonitor* _tmp27_; + GeeList* _tmp23_; + gint _tmp24_; + gpointer _tmp25_; + MediaMonitor* _tmp26_; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _monitor_index; + _tmp20_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp21_ + 1; + _monitor_index = _tmp20_ + 1; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = _monitor_index; + _tmp21_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _monitor_size; + _tmp22_ = _monitor_size; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp22_ < _tmp23_)) { + if (!(_tmp21_ < _tmp22_)) { #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2246 "LibraryMonitor.c" +#line 2577 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _monitor_list; + _tmp23_ = _monitor_list; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _monitor_index; + _tmp24_ = _monitor_index; #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = gee_list_get (_tmp24_, _tmp25_); + _tmp25_ = gee_list_get (_tmp23_, _tmp24_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp26_; + monitor = (MediaMonitor*) _tmp25_; #line 285 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = monitor; + _tmp26_ = monitor; #line 285 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_notify_discovery_started (_tmp27_); + media_monitor_notify_discovery_started (_tmp26_); #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2262 "LibraryMonitor.c" +#line 2593 "LibraryMonitor.c" } #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2266 "LibraryMonitor.c" +#line 2597 "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); + _tmp27_ = 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); #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->discovered = _tmp28_; + self->priv->discovered = _tmp27_; #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp28_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->unknown_files); #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->unknown_files = _tmp29_; + self->priv->unknown_files = _tmp28_; #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 2282 "LibraryMonitor.c" +#line 2613 "LibraryMonitor.c" } -static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* file, GFileInfo* info) { +static void +library_monitor_real_file_discovered (DirectoryMonitor* base, + GFile* file, + GFileInfo* info) +{ LibraryMonitor * self; Monitorable* representation = NULL; MediaMonitor* representing = NULL; gboolean ignore = FALSE; - MediaMonitor* _tmp20_; - GFile* _tmp36_; - GFileInfo* _tmp37_; + MediaMonitor* _tmp18_; #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" @@ -2302,7 +2635,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* representing = NULL; #line 296 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ignore = FALSE; -#line 2306 "LibraryMonitor.c" +#line 2639 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -2330,7 +2663,7 @@ 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 2334 "LibraryMonitor.c" +#line 2667 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -2340,11 +2673,9 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* gpointer _tmp10_; MediaMonitorDiscoveredFile _result_ = 0; MediaMonitor* _tmp11_; - GFile* _tmp12_; - GFileInfo* _tmp13_; - Monitorable* _tmp14_ = NULL; - MediaMonitorDiscoveredFile _tmp15_; - MediaMonitorDiscoveredFile _tmp16_; + Monitorable* _tmp12_ = NULL; + MediaMonitorDiscoveredFile _tmp13_; + MediaMonitorDiscoveredFile _tmp14_; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _monitor_index; #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2357,7 +2688,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 2361 "LibraryMonitor.c" +#line 2692 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -2370,187 +2701,171 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile* #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = monitor; #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = file; -#line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = info; -#line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = media_monitor_notify_file_discovered (_tmp11_, _tmp12_, _tmp13_, &_tmp14_); + _tmp13_ = media_monitor_notify_file_discovered (_tmp11_, file, info, &_tmp12_); #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representation); #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - representation = _tmp14_; + representation = _tmp12_; #line 298 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = _tmp15_; + _result_ = _tmp13_; #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _result_; + _tmp14_ = _result_; #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { -#line 2389 "LibraryMonitor.c" - MediaMonitor* _tmp17_; - MediaMonitor* _tmp18_; + if (_tmp14_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { +#line 2716 "LibraryMonitor.c" + MediaMonitor* _tmp15_; + MediaMonitor* _tmp16_; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = monitor; + _tmp15_ = monitor; #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representing); #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - representing = _tmp18_; + representing = _tmp16_; #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2404 "LibraryMonitor.c" +#line 2731 "LibraryMonitor.c" } else { - MediaMonitorDiscoveredFile _tmp19_; + MediaMonitorDiscoveredFile _tmp17_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _result_; + _tmp17_ = _result_; #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp19_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE) { + if (_tmp17_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE) { #line 306 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" ignore = TRUE; #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2417 "LibraryMonitor.c" +#line 2744 "LibraryMonitor.c" } } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 2422 "LibraryMonitor.c" +#line 2749 "LibraryMonitor.c" } #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 2426 "LibraryMonitor.c" +#line 2753 "LibraryMonitor.c" } #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = representing; + _tmp18_ = representing; #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp20_ != NULL) { -#line 2432 "LibraryMonitor.c" - gboolean _tmp21_ = FALSE; - Monitorable* _tmp22_; - MediaMonitor* _tmp24_; - Monitorable* _tmp25_; + if (_tmp18_ != NULL) { +#line 2759 "LibraryMonitor.c" + gboolean _tmp19_ = FALSE; + Monitorable* _tmp20_; + MediaMonitor* _tmp22_; + Monitorable* _tmp23_; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = representation; + _tmp20_ = representation; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp22_ != NULL) { -#line 2441 "LibraryMonitor.c" - gboolean _tmp23_; + if (_tmp20_ != NULL) { +#line 2768 "LibraryMonitor.c" + gboolean _tmp21_; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = ignore; + _tmp21_ = ignore; #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = !_tmp23_; -#line 2447 "LibraryMonitor.c" + _tmp19_ = !_tmp21_; +#line 2774 "LibraryMonitor.c" } else { #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = FALSE; -#line 2451 "LibraryMonitor.c" + _tmp19_ = FALSE; +#line 2778 "LibraryMonitor.c" } #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_tmp21_, "representation != null && !ignore"); + _vala_assert (_tmp19_, "representation != null && !ignore"); #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = representing; + _tmp22_ = representing; #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = representation; + _tmp23_ = representation; #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_add_to_discovered_list (self, _tmp24_, _tmp25_); -#line 2461 "LibraryMonitor.c" + library_monitor_add_to_discovered_list (self, _tmp22_, _tmp23_); +#line 2788 "LibraryMonitor.c" } else { - gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_; -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = ignore; + gboolean _tmp24_ = FALSE; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp28_) { -#line 2470 "LibraryMonitor.c" - TombstoneSourceCollection* _tmp29_; - GFile* _tmp30_; - gboolean _tmp31_; + _tmp26_ = ignore; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = tombstone_global; + if (!_tmp26_) { +#line 2797 "LibraryMonitor.c" + TombstoneSourceCollection* _tmp27_; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = file; + _tmp27_ = tombstone_global; #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = tombstone_source_collection_matches (_tmp29_, _tmp30_); -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = !_tmp31_; -#line 2482 "LibraryMonitor.c" + _tmp25_ = !tombstone_source_collection_matches (_tmp27_, file); +#line 2803 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = FALSE; -#line 2486 "LibraryMonitor.c" + _tmp25_ = FALSE; +#line 2807 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp27_) { -#line 2490 "LibraryMonitor.c" - GFile* _tmp32_; - gboolean _tmp33_; -#line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = file; + if (_tmp25_) { #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 2499 "LibraryMonitor.c" + _tmp24_ = library_monitor_is_supported_filetype (self, file); +#line 2813 "LibraryMonitor.c" } else { #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = FALSE; -#line 2503 "LibraryMonitor.c" + _tmp24_ = FALSE; +#line 2817 "LibraryMonitor.c" } #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp26_) { -#line 2507 "LibraryMonitor.c" - GeeHashSet* _tmp34_; - GFile* _tmp35_; + if (_tmp24_) { +#line 2821 "LibraryMonitor.c" + GeeHashSet* _tmp28_; #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; + _tmp28_ = self->priv->unknown_files; #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 2516 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 2827 "LibraryMonitor.c" } } #line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = file; -#line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = info; -#line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->file_discovered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp36_, _tmp37_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->file_discovered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representing); #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (representation); -#line 2529 "LibraryMonitor.c" +#line 2836 "LibraryMonitor.c" } -static void library_monitor_real_discovery_completed (DirectoryMonitor* base) { +static void +library_monitor_real_discovery_completed (DirectoryMonitor* base) +{ LibraryMonitor * self; #line 322 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 2539 "LibraryMonitor.c" +#line 2848 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed_data_free (gpointer _data) { +static void +library_monitor_async_discovery_completed_data_free (gpointer _data) +{ LibraryMonitorAsyncDiscoveryCompletedData* _data_; _data_ = _data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->self); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_slice_free (LibraryMonitorAsyncDiscoveryCompletedData, _data_); -#line 2550 "LibraryMonitor.c" +#line 2861 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +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)); @@ -2558,15 +2873,19 @@ static void library_monitor_async_discovery_completed_async_ready_wrapper (GObje if (_task_data_->_callback_ != NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 2562 "LibraryMonitor.c" +#line 2877 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 2566 "LibraryMonitor.c" +#line 2881 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +library_monitor_async_discovery_completed (LibraryMonitor* self, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ LibraryMonitorAsyncDiscoveryCompletedData* _data_; LibraryMonitor* _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2579,7 +2898,7 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 2583 "LibraryMonitor.c" +#line 2902 "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); @@ -2589,42 +2908,49 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs _data_->self = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_async_discovery_completed_co (_data_); -#line 2593 "LibraryMonitor.c" +#line 2912 "LibraryMonitor.c" } -static void library_monitor_async_discovery_completed_finish (LibraryMonitor* self, GAsyncResult* _res_) { +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_task_propagate_pointer (G_TASK (_res_), NULL); -#line 2601 "LibraryMonitor.c" +#line 2923 "LibraryMonitor.c" } -static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpointer self) { +static gboolean +_library_monitor_async_discovery_completed_co_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_async_discovery_completed_co (self); #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 2610 "LibraryMonitor.c" +#line 2934 "LibraryMonitor.c" } -static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_) { +static gboolean +library_monitor_async_discovery_completed_co (LibraryMonitorAsyncDiscoveryCompletedData* _data_) +{ #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" switch (_data_->_state_) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 2619 "LibraryMonitor.c" +#line 2945 "LibraryMonitor.c" goto _state_0; #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 2623 "LibraryMonitor.c" +#line 2949 "LibraryMonitor.c" goto _state_1; default: #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 2628 "LibraryMonitor.c" +#line 2954 "LibraryMonitor.c" } _state_0: #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2645,14 +2971,14 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn while (_data_->_task_complete_ != TRUE) { #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2649 "LibraryMonitor.c" +#line 2975 "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 2656 "LibraryMonitor.c" +#line 2982 "LibraryMonitor.c" } #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); @@ -2662,7 +2988,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn _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 2666 "LibraryMonitor.c" +#line 2992 "LibraryMonitor.c" { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp5_ = _data_->self->priv->unknown_files; @@ -2675,158 +3001,156 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #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_ = gee_iterator_next (_data_->_tmp7_); -#line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_data_->_tmp8_) { + if (!gee_iterator_next (_data_->_tmp7_)) { #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2684 "LibraryMonitor.c" +#line 3008 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp9_ = _data_->_file_it; + _data_->_tmp8_ = _data_->_file_it; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10_ = gee_iterator_get (_data_->_tmp9_); + _data_->_tmp9_ = gee_iterator_get (_data_->_tmp8_); #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->file = (GFile*) _data_->_tmp10_; + _data_->file = (GFile*) _data_->_tmp9_; #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11_ = _data_->file; + _data_->_tmp10_ = _data_->file; #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_); + _data_->_tmp11_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp10_); #line 340 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->info = _data_->_tmp12_; + _data_->info = _data_->_tmp11_; #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13_ = _data_->info; + _data_->_tmp12_ = _data_->info; #line 341 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp13_ == NULL) { + if (_data_->_tmp12_ == NULL) { #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->info); #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 2708 "LibraryMonitor.c" +#line 3032 "LibraryMonitor.c" } #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp14_ = _data_->all_candidates; + _data_->_tmp13_ = _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)); + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 347 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->candidates = NULL; #line 348 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->associated = FALSE; -#line 2718 "LibraryMonitor.c" +#line 3042 "LibraryMonitor.c" { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp15_ = _data_->self->priv->monitors; + _data_->_tmp14_ = _data_->self->priv->monitors; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = _g_object_ref0 (_data_->_tmp15_); + _data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_monitor_list = _data_->_tmp16_; + _data_->_monitor_list = _data_->_tmp15_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp17_ = _data_->_monitor_list; + _data_->_tmp16_ = _data_->_monitor_list; #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)); + _data_->_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_COLLECTION, GeeCollection)); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp18_ = _data_->_tmp17_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_monitor_size = _data_->_tmp19_; + _data_->_monitor_size = _data_->_tmp18_; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_monitor_index = -1; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20_ = _data_->_monitor_index; + _data_->_tmp19_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_monitor_index = _data_->_tmp20_ + 1; + _data_->_monitor_index = _data_->_tmp19_ + 1; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp21_ = _data_->_monitor_index; + _data_->_tmp20_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp22_ = _data_->_monitor_size; + _data_->_tmp21_ = _data_->_monitor_size; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_data_->_tmp21_ < _data_->_tmp22_)) { + if (!(_data_->_tmp20_ < _data_->_tmp21_)) { #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2750 "LibraryMonitor.c" +#line 3074 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp23_ = _data_->_monitor_list; + _data_->_tmp22_ = _data_->_monitor_list; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp24_ = _data_->_monitor_index; + _data_->_tmp23_ = _data_->_monitor_index; #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp25_ = gee_list_get (_data_->_tmp23_, _data_->_tmp24_); + _data_->_tmp24_ = gee_list_get (_data_->_tmp22_, _data_->_tmp23_); #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->monitor = (MediaMonitor*) _data_->_tmp25_; + _data_->monitor = (MediaMonitor*) _data_->_tmp24_; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp26_ = _data_->monitor; + _data_->_tmp25_ = _data_->monitor; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = _data_->file; + _data_->_tmp26_ = _data_->file; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp28_ = _data_->info; + _data_->_tmp27_ = _data_->info; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp29_ = 0; + _data_->_tmp28_ = 0; #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_); + _data_->_tmp29_ = media_monitor_candidates_for_unknown_file (_data_->_tmp25_, _data_->_tmp26_, _data_->_tmp27_, &_data_->_tmp28_); #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_result_ = _data_->_tmp29_; + _data_->_result_ = _data_->_tmp28_; #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->candidates); #line 351 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->candidates = _data_->_tmp30_; + _data_->candidates = _data_->_tmp29_; #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp32_ = _data_->_result_; + _data_->_tmp31_ = _data_->_result_; #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { + if (_data_->_tmp31_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = TRUE; -#line 2782 "LibraryMonitor.c" + _data_->_tmp30_ = TRUE; +#line 3106 "LibraryMonitor.c" } else { #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = _data_->_result_; + _data_->_tmp32_ = _data_->_result_; #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = _data_->_tmp33_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 2788 "LibraryMonitor.c" + _data_->_tmp30_ = _data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; +#line 3112 "LibraryMonitor.c" } #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp31_) { + if (_data_->_tmp30_) { #line 354 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->associated = TRUE; #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 2798 "LibraryMonitor.c" +#line 3122 "LibraryMonitor.c" } else { #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp34_ = _data_->candidates; + _data_->_tmp33_ = _data_->candidates; #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp34_ != NULL) { + if (_data_->_tmp33_ != NULL) { #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp35_ = _data_->all_candidates; + _data_->_tmp34_ = _data_->all_candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp36_ = _data_->candidates; + _data_->_tmp35_ = _data_->candidates; #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_array_list_add_all (_data_->_tmp35_, _data_->_tmp36_); -#line 2810 "LibraryMonitor.c" + gee_array_list_add_all (_data_->_tmp34_, _data_->_tmp35_); +#line 3134 "LibraryMonitor.c" } } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); -#line 2815 "LibraryMonitor.c" +#line 3139 "LibraryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_monitor_list); -#line 2819 "LibraryMonitor.c" +#line 3143 "LibraryMonitor.c" } #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp37_ = _data_->associated; + _data_->_tmp36_ = _data_->associated; #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp37_) { + if (_data_->_tmp36_) { #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp38_ = _data_->adopted; + _data_->_tmp37_ = _data_->adopted; #line 363 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp39_ = _data_->file; + _data_->_tmp38_ = _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_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _data_->_tmp38_); #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->candidates); #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2835,49 +3159,49 @@ 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 2839 "LibraryMonitor.c" +#line 3163 "LibraryMonitor.c" } #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp40_ = _data_->all_candidates; + _data_->_tmp39_ = _data_->all_candidates; #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)); + _data_->_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp42_ = _data_->_tmp41_; + _data_->_tmp41_ = _data_->_tmp40_; #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp42_ > 0) { + if (_data_->_tmp41_ > 0) { #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp43_ = _data_->all_candidates; + _data_->_tmp42_ = _data_->all_candidates; #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp44_ = _g_object_ref0 (_data_->_tmp43_); + _data_->_tmp43_ = _g_object_ref0 (_data_->_tmp42_); #line 371 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->job_candidates = _data_->_tmp44_; + _data_->job_candidates = _data_->_tmp43_; #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); + _data_->_tmp44_ = 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_; + _data_->all_candidates = _data_->_tmp44_; #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp46_ = _data_->self->priv->checksums_total; + _data_->_tmp45_ = _data_->self->priv->checksums_total; #line 374 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->self->priv->checksums_total = _data_->_tmp46_ + 1; + _data_->self->priv->checksums_total = _data_->_tmp45_ + 1; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp47_ = _data_->self->priv->workers; + _data_->_tmp46_ = _data_->self->priv->workers; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp48_ = _data_->file; + _data_->_tmp47_ = _data_->file; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp49_ = _data_->job_candidates; + _data_->_tmp48_ = _data_->job_candidates; #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)); + _data_->_tmp49_ = library_monitor_find_move_job_new (_data_->self, _data_->_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp48_, GEE_TYPE_COLLECTION, GeeCollection)); #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp50_ = _data_->_tmp49_; #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - workers_enqueue (_data_->_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp51_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_data_->_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp50_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 375 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _background_job_unref0 (_data_->_tmp51_); + _background_job_unref0 (_data_->_tmp50_); #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->job_candidates); -#line 2881 "LibraryMonitor.c" +#line 3205 "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); @@ -2885,7 +3209,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 2889 "LibraryMonitor.c" +#line 3213 "LibraryMonitor.c" _state_1: ; #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -2894,45 +3218,45 @@ 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 2898 "LibraryMonitor.c" +#line 3222 "LibraryMonitor.c" } #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->_file_it); -#line 2902 "LibraryMonitor.c" +#line 3226 "LibraryMonitor.c" } #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp52_ = _data_->self->priv->unknown_files; + _data_->_tmp51_ = _data_->self->priv->unknown_files; #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp53_ = _data_->adopted; + _data_->_tmp52_ = _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)); + gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp52_, 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_ = _data_->self->priv->checksums_total; + _data_->_tmp53_ = _data_->self->priv->checksums_total; #line 387 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp54_ == 0) { + if (_data_->_tmp53_ == 0) { #line 388 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discovery_stage_completed (_data_->self); -#line 2918 "LibraryMonitor.c" +#line 3242 "LibraryMonitor.c" } else { #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp55_ = _data_->self->priv->checksums_total; + _data_->_tmp54_ = _data_->self->priv->checksums_total; #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_); + _data_->_tmp55_ = g_strdup_printf ("%d checksum jobs initiated to verify unknown photo files", _data_->_tmp54_); #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp57_ = _data_->_tmp56_; + _data_->_tmp56_ = _data_->_tmp55_; #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_data_->_tmp57_); + directory_monitor_mdbg (_data_->_tmp56_); #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_data_->_tmp57_); + _g_free0 (_data_->_tmp56_); #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp58_ = _data_->self->priv->checksums_completed; + _data_->_tmp57_ = _data_->self->priv->checksums_completed; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp59_ = _data_->self->priv->checksums_total; + _data_->_tmp58_ = _data_->self->priv->checksums_total; #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp58_, _data_->_tmp59_); -#line 2936 "LibraryMonitor.c" + g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp57_, _data_->_tmp58_); +#line 3260 "LibraryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->adopted); @@ -2946,18 +3270,20 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn while (_data_->_task_complete_ != TRUE) { #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); -#line 2950 "LibraryMonitor.c" +#line 3274 "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 2957 "LibraryMonitor.c" +#line 3281 "LibraryMonitor.c" } -static void library_monitor_report_checksum_job_completed (LibraryMonitor* self) { +static void +library_monitor_report_checksum_job_completed (LibraryMonitor* self) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -2991,196 +3317,203 @@ 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 2995 "LibraryMonitor.c" +#line 3321 "LibraryMonitor.c" } } -static gpointer _background_job_ref0 (gpointer 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 3003 "LibraryMonitor.c" +#line 3331 "LibraryMonitor.c" } -static void library_monitor_on_find_move_completed (LibraryMonitor* self, BackgroundJob* j) { +static void +library_monitor_on_find_move_completed (LibraryMonitor* self, + BackgroundJob* j) +{ LibraryMonitorFindMoveJob* job = NULL; - BackgroundJob* _tmp0_; + LibraryMonitorFindMoveJob* _tmp0_; LibraryMonitorFindMoveJob* _tmp1_; - LibraryMonitorFindMoveJob* _tmp2_; - Monitorable* _tmp3_; - LibraryMonitorFindMoveJob* _tmp28_; - GError* _tmp29_; + Monitorable* _tmp2_; + LibraryMonitorFindMoveJob* _tmp27_; + GError* _tmp28_; #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" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = j; + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob)); #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, LibraryMonitorFindMoveJob)); -#line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = job; + _tmp1_ = job; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->match; + _tmp2_ = _tmp1_->match; #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp3_ != NULL) { -#line 3031 "LibraryMonitor.c" - LibraryMonitorFindMoveJob* _tmp4_; - GFile* _tmp5_; + if (_tmp2_ != NULL) { +#line 3359 "LibraryMonitor.c" + LibraryMonitorFindMoveJob* _tmp3_; + GFile* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - LibraryMonitorFindMoveJob* _tmp8_; - Monitorable* _tmp9_; + LibraryMonitorFindMoveJob* _tmp7_; + Monitorable* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; MediaMonitor* monitor = NULL; - LibraryMonitorFindMoveJob* _tmp14_; - Monitorable* _tmp15_; + LibraryMonitorFindMoveJob* _tmp13_; + Monitorable* _tmp14_; + MediaMonitor* _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_; + LibraryMonitorFindMoveJob* _tmp17_; + Monitorable* _tmp18_; + LibraryMonitorFindMoveJob* _tmp19_; + GFile* _tmp20_; + GeeHashSet* _tmp21_; + LibraryMonitorFindMoveJob* _tmp22_; + GFile* _tmp23_; + MediaMonitor* _tmp24_; + LibraryMonitorFindMoveJob* _tmp25_; + Monitorable* _tmp26_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = job; + _tmp3_ = job; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_->file; + _tmp4_ = _tmp3_->file; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (_tmp4_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = job; + _tmp7_ = job; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_->match; + _tmp8_ = _tmp7_->match; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = g_strdup_printf ("Found moved master file: %s matches %s", _tmp7_, _tmp11_); + _tmp11_ = g_strdup_printf ("Found moved master file: %s matches %s", _tmp6_, _tmp10_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp13_); + directory_monitor_mdbg (_tmp12_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 412 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = job; + _tmp13_ = job; #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _tmp14_->match; + _tmp14_ = _tmp13_->match; #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = library_monitor_get_monitor_for_monitorable (self, _tmp15_); + _tmp15_ = library_monitor_get_monitor_for_monitorable (self, _tmp14_); #line 415 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = _tmp16_; + monitor = _tmp15_; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = monitor; + _tmp16_ = monitor; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = job; + _tmp17_ = job; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _tmp18_->match; + _tmp18_ = _tmp17_->match; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = job; + _tmp19_ = job; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _tmp20_->file; + _tmp20_ = _tmp19_->file; #line 416 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_master_file (_tmp17_, _tmp19_, _tmp21_); + media_monitor_update_master_file (_tmp16_, _tmp18_, _tmp20_); #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = self->priv->unknown_files; + _tmp21_ = self->priv->unknown_files; #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = job; + _tmp22_ = job; #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_->file; + _tmp23_ = _tmp22_->file; #line 417 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = monitor; + _tmp24_ = monitor; #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = job; + _tmp25_ = job; #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _tmp26_->match; + _tmp26_ = _tmp25_->match; #line 418 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_add_to_discovered_list (self, _tmp25_, _tmp27_); + library_monitor_add_to_discovered_list (self, _tmp24_, _tmp26_); #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 3123 "LibraryMonitor.c" +#line 3451 "LibraryMonitor.c" } #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = job; + _tmp27_ = job; #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _tmp28_->err; + _tmp28_ = _tmp27_->err; #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp29_ != NULL) { -#line 3131 "LibraryMonitor.c" - LibraryMonitorFindMoveJob* _tmp30_; - GFile* _tmp31_; + if (_tmp28_ != NULL) { +#line 3459 "LibraryMonitor.c" + LibraryMonitorFindMoveJob* _tmp29_; + GFile* _tmp30_; + gchar* _tmp31_; gchar* _tmp32_; - gchar* _tmp33_; - LibraryMonitorFindMoveJob* _tmp34_; - GError* _tmp35_; - const gchar* _tmp36_; + LibraryMonitorFindMoveJob* _tmp33_; + GError* _tmp34_; + const gchar* _tmp35_; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = job; + _tmp29_ = job; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = _tmp30_->file; + _tmp30_ = _tmp29_->file; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = g_file_get_path (_tmp31_); + _tmp31_ = g_file_get_path (_tmp30_); #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = _tmp32_; + _tmp32_ = _tmp31_; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = job; + _tmp33_ = job; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _tmp34_->err; + _tmp34_ = _tmp33_->err; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _tmp35_->message; + _tmp35_ = _tmp34_->message; #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp33_, _tmp36_); + g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp32_, _tmp35_); #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp33_); -#line 3157 "LibraryMonitor.c" + _g_free0 (_tmp32_); +#line 3485 "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 3163 "LibraryMonitor.c" +#line 3491 "LibraryMonitor.c" } -static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, BackgroundJob* j) { +static void +library_monitor_on_find_move_cancelled (LibraryMonitor* self, + BackgroundJob* j) +{ #line 427 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); #line 427 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 3174 "LibraryMonitor.c" +#line 3505 "LibraryMonitor.c" } -static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { - gboolean _tmp65_; - TombstoneSourceCollection* _tmp67_; - GCancellable* _tmp68_; +static void +library_monitor_discovery_stage_completed (LibraryMonitor* self) +{ + gboolean _tmp60_; + TombstoneSourceCollection* _tmp62_; + GCancellable* _tmp63_; #line 431 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); -#line 3184 "LibraryMonitor.c" +#line 3517 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_; @@ -3208,7 +3541,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitor_index = -1; #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3212 "LibraryMonitor.c" +#line 3545 "LibraryMonitor.c" gint _tmp5_; gint _tmp6_; gint _tmp7_; @@ -3233,7 +3566,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { if (!(_tmp6_ < _tmp7_)) { #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3237 "LibraryMonitor.c" +#line 3570 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _monitor_list; @@ -3255,7 +3588,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _tmp14_ = monitorables; #line 434 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp14_ != NULL) { -#line 3259 "LibraryMonitor.c" +#line 3592 "LibraryMonitor.c" { GeeIterator* _monitorable_it = NULL; GeeSet* _tmp15_; @@ -3268,302 +3601,287 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { _monitorable_it = _tmp16_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3272 "LibraryMonitor.c" +#line 3605 "LibraryMonitor.c" GeeIterator* _tmp17_; - gboolean _tmp18_; Monitorable* monitorable = NULL; - GeeIterator* _tmp19_; - gpointer _tmp20_; - Monitorable* _tmp21_; - MediaMonitor* _tmp22_; + GeeIterator* _tmp18_; + gpointer _tmp19_; + Monitorable* _tmp20_; + MediaMonitor* _tmp21_; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp17_ = _monitorable_it; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_iterator_next (_tmp17_); -#line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp18_) { + if (!gee_iterator_next (_tmp17_)) { #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3288 "LibraryMonitor.c" +#line 3618 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = _monitorable_it; + _tmp18_ = _monitorable_it; #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = gee_iterator_get (_tmp19_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitorable = (Monitorable*) _tmp20_; + monitorable = (Monitorable*) _tmp19_; #line 436 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = monitorable; + _tmp20_ = monitorable; #line 436 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = monitor; + _tmp21_ = monitor; #line 436 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_verify_monitorable (self, _tmp21_, _tmp22_); + library_monitor_enqueue_verify_monitorable (self, _tmp20_, _tmp21_); #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); -#line 3304 "LibraryMonitor.c" +#line 3634 "LibraryMonitor.c" } #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitorable_it); -#line 3308 "LibraryMonitor.c" +#line 3638 "LibraryMonitor.c" } } { GeeIterator* _object_it = NULL; - MediaMonitor* _tmp23_; + MediaMonitor* _tmp22_; + MediaSourceCollection* _tmp23_; MediaSourceCollection* _tmp24_; - MediaSourceCollection* _tmp25_; + GeeCollection* _tmp25_; GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + GeeIterator* _tmp27_; GeeIterator* _tmp28_; - GeeIterator* _tmp29_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = monitor; + _tmp22_ = monitor; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = media_monitor_get_media_source_collection (_tmp23_); + _tmp23_ = media_monitor_get_media_source_collection (_tmp22_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp25_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection)); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable)); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp26_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_collection_unref0 (_tmp25_); + _data_collection_unref0 (_tmp24_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _object_it = _tmp29_; + _object_it = _tmp28_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3342 "LibraryMonitor.c" - GeeIterator* _tmp30_; - gboolean _tmp31_; +#line 3672 "LibraryMonitor.c" + GeeIterator* _tmp29_; DataObject* object = NULL; - GeeIterator* _tmp32_; - gpointer _tmp33_; + GeeIterator* _tmp30_; + gpointer _tmp31_; Monitorable* monitorable = NULL; - DataObject* _tmp34_; - Monitorable* _tmp35_; - gboolean _tmp36_ = FALSE; - GeeSet* _tmp37_; - Monitorable* _tmp41_; - MediaMonitor* _tmp42_; -#line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = _object_it; + DataObject* _tmp32_; + Monitorable* _tmp33_; + gboolean _tmp34_ = FALSE; + GeeSet* _tmp35_; + Monitorable* _tmp38_; + MediaMonitor* _tmp39_; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = gee_iterator_next (_tmp30_); + _tmp29_ = _object_it; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp31_) { + if (!gee_iterator_next (_tmp29_)) { #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3363 "LibraryMonitor.c" +#line 3690 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = _object_it; + _tmp30_ = _object_it; #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = gee_iterator_get (_tmp32_); + _tmp31_ = gee_iterator_get (_tmp30_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - object = (DataObject*) _tmp33_; + object = (DataObject*) _tmp31_; #line 440 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = object; + _tmp32_ = object; #line 440 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MONITORABLE, Monitorable)); + _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MONITORABLE, Monitorable)); #line 440 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitorable = _tmp35_; -#line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = monitorables; + monitorable = _tmp33_; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp37_ != NULL) { -#line 3381 "LibraryMonitor.c" - GeeSet* _tmp38_; - Monitorable* _tmp39_; - gboolean _tmp40_; + _tmp35_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = monitorables; + if (_tmp35_ != NULL) { +#line 3708 "LibraryMonitor.c" + GeeSet* _tmp36_; + Monitorable* _tmp37_; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = monitorable; + _tmp36_ = monitorables; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_); + _tmp37_ = monitorable; #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _tmp40_; -#line 3393 "LibraryMonitor.c" + _tmp34_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); +#line 3717 "LibraryMonitor.c" } else { #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = FALSE; -#line 3397 "LibraryMonitor.c" + _tmp34_ = FALSE; +#line 3721 "LibraryMonitor.c" } #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp36_) { + if (_tmp34_) { #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (object); #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 3407 "LibraryMonitor.c" +#line 3731 "LibraryMonitor.c" } #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = monitorable; + _tmp38_ = monitorable; #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = monitor; + _tmp39_ = monitor; #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_verify_monitorable (self, _tmp41_, _tmp42_); + library_monitor_enqueue_verify_monitorable (self, _tmp38_, _tmp39_); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (object); -#line 3419 "LibraryMonitor.c" +#line 3743 "LibraryMonitor.c" } #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_object_it); -#line 3423 "LibraryMonitor.c" +#line 3747 "LibraryMonitor.c" } { GeeIterator* _source_it = NULL; - MediaMonitor* _tmp43_; - MediaSourceCollection* _tmp44_; - MediaSourceCollection* _tmp45_; - MediaSourceHoldingTank* _tmp46_; - MediaSourceHoldingTank* _tmp47_; - GeeCollection* _tmp48_; - GeeCollection* _tmp49_; - GeeIterator* _tmp50_; - GeeIterator* _tmp51_; + MediaMonitor* _tmp40_; + MediaSourceCollection* _tmp41_; + MediaSourceCollection* _tmp42_; + MediaSourceHoldingTank* _tmp43_; + MediaSourceHoldingTank* _tmp44_; + GeeCollection* _tmp45_; + GeeCollection* _tmp46_; + GeeIterator* _tmp47_; + GeeIterator* _tmp48_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = monitor; + _tmp40_ = monitor; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = media_monitor_get_media_source_collection (_tmp43_); + _tmp41_ = media_monitor_get_media_source_collection (_tmp40_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = _tmp44_; + _tmp42_ = _tmp41_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = media_source_collection_get_offline_bin (_tmp45_); + _tmp43_ = media_source_collection_get_offline_bin (_tmp42_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = _tmp46_; + _tmp44_ = _tmp43_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp48_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); + _tmp45_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank)); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = _tmp48_; + _tmp46_ = _tmp45_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp50_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp47_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ITERABLE, GeeIterable)); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp51_ = _tmp50_; + _tmp48_ = _tmp47_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp49_); + _g_object_unref0 (_tmp46_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _source_holding_tank_unref0 (_tmp47_); + _source_holding_tank_unref0 (_tmp44_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_collection_unref0 (_tmp45_); + _data_collection_unref0 (_tmp42_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _source_it = _tmp51_; + _source_it = _tmp48_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 3464 "LibraryMonitor.c" - GeeIterator* _tmp52_; - gboolean _tmp53_; +#line 3788 "LibraryMonitor.c" + GeeIterator* _tmp49_; DataSource* source = NULL; - GeeIterator* _tmp54_; - gpointer _tmp55_; + GeeIterator* _tmp50_; + gpointer _tmp51_; Monitorable* monitorable = NULL; - DataSource* _tmp56_; - Monitorable* _tmp57_; - gboolean _tmp58_ = FALSE; - GeeSet* _tmp59_; - Monitorable* _tmp63_; - MediaMonitor* _tmp64_; + DataSource* _tmp52_; + Monitorable* _tmp53_; + gboolean _tmp54_ = FALSE; + GeeSet* _tmp55_; + Monitorable* _tmp58_; + MediaMonitor* _tmp59_; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp52_ = _source_it; + _tmp49_ = _source_it; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp53_ = gee_iterator_next (_tmp52_); -#line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp53_) { + if (!gee_iterator_next (_tmp49_)) { #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3485 "LibraryMonitor.c" +#line 3806 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp54_ = _source_it; + _tmp50_ = _source_it; #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp55_ = gee_iterator_get (_tmp54_); + _tmp51_ = gee_iterator_get (_tmp50_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - source = (DataSource*) _tmp55_; + source = (DataSource*) _tmp51_; #line 450 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp56_ = source; + _tmp52_ = source; #line 450 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_MONITORABLE, Monitorable)); + _tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_MONITORABLE, Monitorable)); #line 450 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitorable = _tmp57_; + monitorable = _tmp53_; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp59_ = monitorables; + _tmp55_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp59_ != NULL) { -#line 3503 "LibraryMonitor.c" - GeeSet* _tmp60_; - Monitorable* _tmp61_; - gboolean _tmp62_; + if (_tmp55_ != NULL) { +#line 3824 "LibraryMonitor.c" + GeeSet* _tmp56_; + Monitorable* _tmp57_; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = monitorables; + _tmp56_ = monitorables; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp61_ = monitorable; + _tmp57_ = monitorable; #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 3515 "LibraryMonitor.c" + _tmp54_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_); +#line 3833 "LibraryMonitor.c" } else { #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = FALSE; -#line 3519 "LibraryMonitor.c" + _tmp54_ = FALSE; +#line 3837 "LibraryMonitor.c" } #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp58_) { + if (_tmp54_) { #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (source); #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 3529 "LibraryMonitor.c" +#line 3847 "LibraryMonitor.c" } #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp63_ = monitorable; + _tmp58_ = monitorable; #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp64_ = monitor; + _tmp59_ = monitor; #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_verify_monitorable (self, _tmp63_, _tmp64_); + library_monitor_enqueue_verify_monitorable (self, _tmp58_, _tmp59_); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitorable); #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (source); -#line 3541 "LibraryMonitor.c" +#line 3859 "LibraryMonitor.c" } #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_source_it); -#line 3545 "LibraryMonitor.c" +#line 3863 "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 3551 "LibraryMonitor.c" +#line 3869 "LibraryMonitor.c" } #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 3555 "LibraryMonitor.c" +#line 3873 "LibraryMonitor.c" } #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp65_ = self->priv->auto_import; + _tmp60_ = self->priv->auto_import; #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp65_) { -#line 3561 "LibraryMonitor.c" - GeeHashSet* _tmp66_; + if (_tmp60_) { +#line 3879 "LibraryMonitor.c" + GeeHashSet* _tmp61_; #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp66_ = self->priv->unknown_files; + _tmp61_ = 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 3567 "LibraryMonitor.c" + library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 3885 "LibraryMonitor.c" } #line 464 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->discovered); @@ -3574,26 +3892,27 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) { #line 465 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->unknown_files = NULL; #line 469 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp67_ = tombstone_global; + _tmp62_ = tombstone_global; #line 469 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp68_ = self->priv->cancellable; + _tmp63_ = self->priv->cancellable; #line 469 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone_source_collection_launch_scan (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp68_); + tombstone_source_collection_launch_scan (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp63_); #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 3585 "LibraryMonitor.c" +#line 3903 "LibraryMonitor.c" } -static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor) { +static void +library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor) +{ gboolean offered = FALSE; GeeQueue* _tmp0_; - Monitorable* _tmp1_; - MediaMonitor* _tmp2_; - LibraryMonitorVerifyJob* _tmp3_; - LibraryMonitorVerifyJob* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + LibraryMonitorVerifyJob* _tmp1_; + LibraryMonitorVerifyJob* _tmp2_; + gboolean _tmp3_; #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" @@ -3603,30 +3922,26 @@ static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Mo #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->verify_queue; #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = monitorable; -#line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = monitor; -#line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = library_monitor_verify_job_new (_tmp1_, _tmp2_); + _tmp1_ = library_monitor_verify_job_new (monitorable, monitor); #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_queue_offer (_tmp0_, _tmp4_); + _tmp3_ = gee_queue_offer (_tmp0_, _tmp2_); #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _tmp5_; + _library_monitor_verify_job_unref0 (_tmp2_); #line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _library_monitor_verify_job_unref0 (_tmp4_); -#line 476 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - offered = _tmp6_; + offered = _tmp3_; #line 477 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _vala_assert (offered, "offered"); #line 479 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_execute_next_verify_job (self); -#line 3626 "LibraryMonitor.c" +#line 3939 "LibraryMonitor.c" } -static void library_monitor_execute_next_verify_job (LibraryMonitor* self) { +static void +library_monitor_execute_next_verify_job (LibraryMonitor* self) +{ gboolean _tmp0_ = FALSE; gint _tmp1_; LibraryMonitorVerifyJob* job = NULL; @@ -3646,7 +3961,7 @@ 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 3650 "LibraryMonitor.c" +#line 3965 "LibraryMonitor.c" } else { GeeQueue* _tmp2_; gint _tmp3_; @@ -3659,13 +3974,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 3663 "LibraryMonitor.c" +#line 3978 "LibraryMonitor.c" } #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 484 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 3669 "LibraryMonitor.c" +#line 3984 "LibraryMonitor.c" } #line 486 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->verify_queue; @@ -3693,11 +4008,13 @@ 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 3697 "LibraryMonitor.c" +#line 4012 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_data_free (gpointer _data) { +static void +library_monitor_verify_monitorable_data_free (gpointer _data) +{ LibraryMonitorVerifyMonitorableData* _data_; _data_ = _data; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3708,11 +4025,15 @@ 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 3712 "LibraryMonitor.c" +#line 4029 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { +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)); @@ -3720,21 +4041,25 @@ static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *sou if (_task_data_->_callback_ != NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_callback_ (source_object, res, user_data); -#line 3724 "LibraryMonitor.c" +#line 4045 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _task_data_->_task_complete_ = TRUE; -#line 3728 "LibraryMonitor.c" +#line 4049 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorable* monitorable, MediaMonitor* monitor, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void +library_monitor_verify_monitorable (LibraryMonitor* self, + Monitorable* monitorable, + MediaMonitor* monitor, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ LibraryMonitorVerifyMonitorableData* _data_; LibraryMonitor* _tmp0_; Monitorable* _tmp1_; - Monitorable* _tmp2_; - MediaMonitor* _tmp3_; - MediaMonitor* _tmp4_; + MediaMonitor* _tmp2_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_slice_new0 (LibraryMonitorVerifyMonitorableData); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3745,7 +4070,7 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl if (_callback_ == NULL) { #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_task_complete_ = TRUE; -#line 3749 "LibraryMonitor.c" +#line 4074 "LibraryMonitor.c" } #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_task_set_task_data (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free); @@ -3754,53 +4079,61 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->self = _tmp0_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = monitorable; -#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (monitorable); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitorable); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->monitorable = _tmp2_; + _data_->monitorable = _tmp1_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = monitor; -#line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (monitor); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->monitor); #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->monitor = _tmp4_; + _data_->monitor = _tmp2_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3775 "LibraryMonitor.c" +#line 4096 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAsyncResult* _res_) { +static void +library_monitor_verify_monitorable_finish (LibraryMonitor* self, + GAsyncResult* _res_) +{ LibraryMonitorVerifyMonitorableData* _data_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); -#line 3783 "LibraryMonitor.c" +#line 4107 "LibraryMonitor.c" } -static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) { +static void +_vala_array_add131 (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 3794 "LibraryMonitor.c" +#line 4123 "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 3800 "LibraryMonitor.c" +#line 4129 "LibraryMonitor.c" } -static void library_monitor_verify_monitorable_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { +static void +library_monitor_verify_monitorable_ready (GObject* source_object, + GAsyncResult* _res_, + gpointer _user_data_) +{ LibraryMonitorVerifyMonitorableData* _data_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_ = _user_data_; @@ -3812,38 +4145,42 @@ static void library_monitor_verify_monitorable_ready (GObject* source_object, GA _data_->_task_complete_ = TRUE; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_verify_monitorable_co (_data_); -#line 3816 "LibraryMonitor.c" +#line 4149 "LibraryMonitor.c" } -static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer self) { +static gboolean +_library_monitor_verify_monitorable_co_gsource_func (gpointer self) +{ gboolean result; result = library_monitor_verify_monitorable_co (self); #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 3825 "LibraryMonitor.c" +#line 4160 "LibraryMonitor.c" } -static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_) { +static gboolean +library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_) +{ #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" switch (_data_->_state_) { #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 0: -#line 3834 "LibraryMonitor.c" +#line 4171 "LibraryMonitor.c" goto _state_0; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 1: -#line 3838 "LibraryMonitor.c" +#line 4175 "LibraryMonitor.c" goto _state_1; #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" case 2: -#line 3842 "LibraryMonitor.c" +#line 4179 "LibraryMonitor.c" goto _state_2; default: #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_assert_not_reached (); -#line 3847 "LibraryMonitor.c" +#line 4184 "LibraryMonitor.c" } _state_0: #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -3859,70 +4196,62 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit #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_ = _data_->monitor; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp3_ = _data_->monitorable; -#line 495 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp4_ = media_monitor_get_master_file (_data_->_tmp2_, _data_->_tmp3_); + _data_->_tmp2_ = media_monitor_get_master_file (_data_->monitor, _data_->monitorable); #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_; + _data_->_tmp1_[0] = _data_->_tmp2_; #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_ = _data_->monitor; + _data_->_tmp3_ = _data_->_tmp1_[0]; #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp7_ = _data_->monitorable; + _data_->_tmp5_ = media_monitor_get_auxilliary_backing_files (_data_->monitor, _data_->monitorable, &_data_->_tmp4_); #line 497 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp9_ = media_monitor_get_auxilliary_backing_files (_data_->_tmp6_, _data_->_tmp7_, &_data_->_tmp8_); + _data_->aux_files = _data_->_tmp5_; #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_; + _data_->aux_files_length1 = _data_->_tmp4_; #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_ = _data_->aux_files; + _data_->_tmp6_ = _data_->aux_files; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp10__length1 = _data_->aux_files_length1; + _data_->_tmp6__length1 = _data_->aux_files_length1; #line 498 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp10_ != NULL) { + if (_data_->_tmp6_ != NULL) { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11_ = _data_->aux_files; + _data_->_tmp7_ = _data_->aux_files; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp11__length1 = _data_->aux_files_length1; -#line 3896 "LibraryMonitor.c" + _data_->_tmp7__length1 = _data_->aux_files_length1; +#line 4225 "LibraryMonitor.c" { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->aux_file_collection_length1 = 0; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_aux_file_collection_size_ = 0; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_file_collection = _data_->_tmp11_; + _data_->aux_file_collection = _data_->_tmp7_; #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->aux_file_collection_length1 = _data_->_tmp11__length1; + _data_->aux_file_collection_length1 = _data_->_tmp7__length1; #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) { + for (_data_->aux_file_it = 0; _data_->aux_file_it < _data_->_tmp7__length1; _data_->aux_file_it = _data_->aux_file_it + 1) { #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp12_ = _g_object_ref0 (_data_->aux_file_collection[_data_->aux_file_it]); + _data_->_tmp8_ = _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 3912 "LibraryMonitor.c" + _data_->aux_file = _data_->_tmp8_; +#line 4241 "LibraryMonitor.c" { #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13_ = _data_->files; + _data_->_tmp9_ = _data_->files; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp13__length1 = _data_->files_length1; + _data_->_tmp9__length1 = _data_->files_length1; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp14_ = _data_->aux_file; + _data_->_tmp10_ = _data_->aux_file; #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_); + _data_->_tmp11_ = _g_object_ref0 (_data_->_tmp10_); #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_array_add131 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_); + _vala_array_add131 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp11_); #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->aux_file); -#line 3926 "LibraryMonitor.c" +#line 4255 "LibraryMonitor.c" } } } @@ -3930,90 +4259,90 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->ctr = 0; -#line 3934 "LibraryMonitor.c" +#line 4263 "LibraryMonitor.c" { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = TRUE; + _data_->_tmp12_ = TRUE; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_data_->_tmp16_) { + if (!_data_->_tmp12_) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp17_ = _data_->ctr; + _data_->_tmp13_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->ctr = _data_->_tmp17_ + 1; -#line 3946 "LibraryMonitor.c" + _data_->ctr = _data_->_tmp13_ + 1; +#line 4275 "LibraryMonitor.c" } #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp16_ = FALSE; + _data_->_tmp12_ = FALSE; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp18_ = _data_->ctr; + _data_->_tmp14_ = _data_->ctr; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19_ = _data_->files; + _data_->_tmp15_ = _data_->files; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp19__length1 = _data_->files_length1; + _data_->_tmp15__length1 = _data_->files_length1; #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_data_->_tmp18_ < _data_->_tmp19__length1)) { + if (!(_data_->_tmp14_ < _data_->_tmp15__length1)) { #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 3960 "LibraryMonitor.c" +#line 4289 "LibraryMonitor.c" } #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20_ = _data_->files; + _data_->_tmp16_ = _data_->files; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp20__length1 = _data_->files_length1; + _data_->_tmp16__length1 = _data_->files_length1; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp21_ = _data_->ctr; + _data_->_tmp17_ = _data_->ctr; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp22_ = _data_->_tmp20_[_data_->_tmp21_]; + _data_->_tmp18_ = _data_->_tmp16_[_data_->_tmp17_]; #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp23_ = _g_object_ref0 (_data_->_tmp22_); + _data_->_tmp19_ = _g_object_ref0 (_data_->_tmp18_); #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->file = _data_->_tmp23_; + _data_->file = _data_->_tmp19_; #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp24_ = _data_->file; + _data_->_tmp20_ = _data_->file; #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_); + _data_->_tmp21_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _data_->_tmp20_); #line 506 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->info = _data_->_tmp25_; + _data_->info = _data_->_tmp21_; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp26_ = _data_->info; + _data_->_tmp22_ = _data_->info; #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp26_ == NULL) { -#line 3984 "LibraryMonitor.c" + if (_data_->_tmp22_ == NULL) { +#line 4313 "LibraryMonitor.c" { #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp28_ = _data_->file; + _data_->_tmp24_ = _data_->file; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp29_ = _data_->self->priv->cancellable; + _data_->_tmp25_ = _data_->self->priv->cancellable; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_state_ = 1; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - 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_); + g_file_query_info_async (_data_->_tmp24_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_FILE_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp25_, library_monitor_verify_monitorable_ready, _data_); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 3996 "LibraryMonitor.c" +#line 4325 "LibraryMonitor.c" _state_1: #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp30_ = g_file_query_info_finish (_data_->_tmp28_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp26_ = g_file_query_info_finish (_data_->_tmp24_, _data_->_res_, &_data_->_inner_error_); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = _data_->_tmp30_; + _data_->_tmp23_ = _data_->_tmp26_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 4004 "LibraryMonitor.c" +#line 4333 "LibraryMonitor.c" goto __catch495_g_error; } #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp31_ = _data_->_tmp27_; + _data_->_tmp27_ = _data_->_tmp23_; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp27_ = NULL; + _data_->_tmp23_ = NULL; #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->info); #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->info = _data_->_tmp31_; + _data_->info = _data_->_tmp27_; #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_data_->_tmp27_); -#line 4017 "LibraryMonitor.c" + _g_object_unref0 (_data_->_tmp23_); +#line 4346 "LibraryMonitor.c" } goto __finally495; __catch495_g_error: @@ -4024,7 +4353,7 @@ 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 4028 "LibraryMonitor.c" +#line 4357 "LibraryMonitor.c" } __finally495: #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4045,116 +4374,92 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit g_object_unref (_data_->_async_result); #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return FALSE; -#line 4049 "LibraryMonitor.c" +#line 4378 "LibraryMonitor.c" } } #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp32_ = _data_->ctr; + _data_->_tmp28_ = _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_ = _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_ = _data_->monitor; + if (_data_->_tmp28_ == 0) { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp36_ = _data_->monitorable; + _data_->_tmp30_ = _data_->info; #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp37_ = media_monitor_is_offline (_data_->_tmp35_, _data_->_tmp36_); + if (_data_->_tmp30_ != NULL) { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = _data_->_tmp37_; -#line 4068 "LibraryMonitor.c" + _data_->_tmp29_ = media_monitor_is_offline (_data_->monitor, _data_->monitorable); +#line 4391 "LibraryMonitor.c" } else { #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp33_ = FALSE; -#line 4072 "LibraryMonitor.c" + _data_->_tmp29_ = FALSE; +#line 4395 "LibraryMonitor.c" } #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_data_->_tmp33_) { + if (_data_->_tmp29_) { #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp38_ = _data_->monitor; -#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 4082 "LibraryMonitor.c" + media_monitor_update_online (_data_->monitor, _data_->monitorable); +#line 4401 "LibraryMonitor.c" } else { #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_ = _data_->monitor; + _data_->_tmp32_ = _data_->info; #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp43_ = _data_->monitorable; + if (_data_->_tmp32_ == NULL) { #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 4096 "LibraryMonitor.c" + _data_->_tmp31_ = !media_monitor_is_offline (_data_->monitor, _data_->monitorable); +#line 4409 "LibraryMonitor.c" } else { #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp40_ = FALSE; -#line 4100 "LibraryMonitor.c" + _data_->_tmp31_ = FALSE; +#line 4413 "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_ = _data_->monitor; -#line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp46_ = _data_->monitorable; + if (_data_->_tmp31_) { #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_offline (_data_->_tmp45_, _data_->_tmp46_); -#line 4110 "LibraryMonitor.c" + media_monitor_update_offline (_data_->monitor, _data_->monitorable); +#line 4419 "LibraryMonitor.c" } } } #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp47_ = _data_->monitor; + _data_->_tmp33_ = _data_->file; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp48_ = _data_->monitorable; + _data_->_tmp34_ = _data_->info; #line 524 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp49_ = _data_->file; -#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_); + media_monitor_update_backing_file_info (_data_->monitor, _data_->monitorable, _data_->_tmp33_, _data_->_tmp34_); #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->info); #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_data_->file); -#line 4128 "LibraryMonitor.c" +#line 4433 "LibraryMonitor.c" } } } #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp51_ = _data_->self->priv->completed_monitorable_verifies; + _data_->_tmp35_ = _data_->self->priv->completed_monitorable_verifies; #line 527 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->self->priv->completed_monitorable_verifies = _data_->_tmp51_ + 1; + _data_->self->priv->completed_monitorable_verifies = _data_->_tmp35_ + 1; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp52_ = _data_->self->priv->completed_monitorable_verifies; + _data_->_tmp36_ = _data_->self->priv->completed_monitorable_verifies; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp53_ = _data_->self->priv->total_monitorable_verifies; + _data_->_tmp37_ = _data_->self->priv->total_monitorable_verifies; #line 528 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp52_, _data_->_tmp53_); + g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp36_, _data_->_tmp37_); #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 4148 "LibraryMonitor.c" +#line 4453 "LibraryMonitor.c" _state_2: ; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp54_ = _data_->self->priv->outstanding_verify_jobs; + _data_->_tmp38_ = _data_->self->priv->outstanding_verify_jobs; #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_data_->_tmp54_ > 0, "outstanding_verify_jobs > 0"); + _vala_assert (_data_->_tmp38_ > 0, "outstanding_verify_jobs > 0"); #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp55_ = _data_->self->priv->outstanding_verify_jobs; + _data_->_tmp39_ = _data_->self->priv->outstanding_verify_jobs; #line 535 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->self->priv->outstanding_verify_jobs = _data_->_tmp55_ - 1; + _data_->self->priv->outstanding_verify_jobs = _data_->_tmp39_ - 1; #line 537 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_execute_next_verify_job (_data_->self); #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4169,18 +4474,20 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit 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 4173 "LibraryMonitor.c" +#line 4478 "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 4180 "LibraryMonitor.c" +#line 4485 "LibraryMonitor.c" } -static void library_monitor_on_config_changed (LibraryMonitor* self) { +static void +library_monitor_on_config_changed (LibraryMonitor* self) +{ gboolean value = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -4189,7 +4496,6 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { 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" @@ -4198,54 +4504,53 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) { _tmp1_ = _tmp0_; #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_; #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_tmp1_); #line 541 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - value = _tmp3_; + value = _tmp2_; #line 543 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->auto_import; + _tmp3_ = self->priv->auto_import; #line 543 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = value; + _tmp4_ = value; #line 543 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp4_ == _tmp5_) { + if (_tmp3_ == _tmp4_) { #line 544 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4216 "LibraryMonitor.c" +#line 4520 "LibraryMonitor.c" } #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = value; + _tmp5_ = value; #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->auto_import = _tmp6_; + self->priv->auto_import = _tmp5_; #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->auto_import; + _tmp6_ = self->priv->auto_import; #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp7_) { -#line 4226 "LibraryMonitor.c" - gboolean _tmp8_; + if (_tmp6_) { +#line 4530 "LibraryMonitor.c" + gboolean _tmp7_; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = commandline_options_no_runtime_monitoring; + _tmp7_ = commandline_options_no_runtime_monitoring; #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp8_) { + if (!_tmp7_) { #line 549 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_import_unrepresented_files (self); -#line 4234 "LibraryMonitor.c" +#line 4538 "LibraryMonitor.c" } } else { #line 551 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_cancel_batch_imports (self); -#line 4239 "LibraryMonitor.c" +#line 4543 "LibraryMonitor.c" } } -static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { +static void +library_monitor_enqueue_import (LibraryMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = 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" @@ -4253,118 +4558,96 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->pending_imports; #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = file; -#line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); + if (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file)) { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp4_) { -#line 4262 "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 4271 "LibraryMonitor.c" + _tmp1_ = library_monitor_is_supported_filetype (self, file); +#line 4565 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 4275 "LibraryMonitor.c" +#line 4569 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 4279 "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 4288 "LibraryMonitor.c" + _tmp0_ = !library_monitor_is_blacklisted (file); +#line 4575 "LibraryMonitor.c" } else { #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 4292 "LibraryMonitor.c" +#line 4579 "LibraryMonitor.c" } #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 4296 "LibraryMonitor.c" - GeeHashSet* _tmp9_; - GFile* _tmp10_; +#line 4583 "LibraryMonitor.c" + GeeHashSet* _tmp3_; #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = self->priv->import_queue; + _tmp3_ = 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 4305 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 4589 "LibraryMonitor.c" } } -static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollection* files) { +static void +library_monitor_enqueue_import_many (LibraryMonitor* self, + GeeCollection* files) +{ #line 560 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 4315 "LibraryMonitor.c" +#line 4602 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp0_; - GeeIterator* _tmp1_; -#line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = files; + GeeIterator* _tmp0_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (files, GEE_TYPE_ITERABLE, GeeIterable)); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _file_it = _tmp1_; + _file_it = _tmp0_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4328 "LibraryMonitor.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 4612 "LibraryMonitor.c" + GeeIterator* _tmp1_; GFile* file = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; - GFile* _tmp6_; + GeeIterator* _tmp2_; + gpointer _tmp3_; + GFile* _tmp4_; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = _file_it; -#line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _file_it; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4343 "LibraryMonitor.c" +#line 4624 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _file_it; + _tmp2_ = _file_it; #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - file = (GFile*) _tmp5_; + file = (GFile*) _tmp3_; #line 562 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = file; + _tmp4_ = file; #line 562 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_import (self, _tmp6_); + library_monitor_enqueue_import (self, _tmp4_); #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 4357 "LibraryMonitor.c" +#line 4638 "LibraryMonitor.c" } #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4361 "LibraryMonitor.c" +#line 4642 "LibraryMonitor.c" } } -static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* file) { +static void +library_monitor_remove_queued_import (LibraryMonitor* self, + GFile* file) +{ 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" @@ -4372,243 +4655,231 @@ static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* f #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = self->priv->import_queue; #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 4379 "LibraryMonitor.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 4660 "LibraryMonitor.c" } -static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) { +static gboolean +library_monitor_on_flush_import_queue (LibraryMonitor* self) +{ gboolean result = FALSE; GCancellable* _tmp0_; - gboolean _tmp1_; - GeeHashSet* _tmp2_; + GeeHashSet* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - BatchImport* _tmp5_; - GeeHashSet* _tmp6_; + BatchImport* _tmp4_; + GeeHashSet* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; time_t now = 0; - gulong _tmp11_; - gboolean _tmp12_ = FALSE; - BatchImportRoll* _tmp13_; - time_t _tmp17_; + gboolean _tmp10_ = FALSE; + BatchImportRoll* _tmp11_; + time_t _tmp15_; GeeArrayList* jobs = NULL; - GeeArrayList* _tmp18_; - GeeHashSet* _tmp33_; + GeeArrayList* _tmp16_; + GeeHashSet* _tmp29_; BatchImport* importer = NULL; - GeeArrayList* _tmp34_; - BatchImportRoll* _tmp35_; + GeeArrayList* _tmp30_; + BatchImportRoll* _tmp31_; + BatchImport* _tmp32_; + BatchImport* _tmp33_; + BatchImport* _tmp34_; + GeeArrayList* _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" _tmp0_ = self->priv->cancellable; #line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = g_cancellable_is_cancelled (_tmp0_); -#line 570 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { + if (g_cancellable_is_cancelled (_tmp0_)) { #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = FALSE; #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4424 "LibraryMonitor.c" +#line 4703 "LibraryMonitor.c" } #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = self->priv->import_queue; + _tmp1_ = self->priv->import_queue; #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp4_ == 0) { + if (_tmp3_ == 0) { #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = TRUE; #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4438 "LibraryMonitor.c" +#line 4717 "LibraryMonitor.c" } #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = self->priv->current_batch_import; + _tmp4_ = self->priv->current_batch_import; #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp5_ != NULL) { + if (_tmp4_ != NULL) { #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" result = TRUE; #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 4448 "LibraryMonitor.c" +#line 4727 "LibraryMonitor.c" } #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = self->priv->import_queue; + _tmp5_ = self->priv->import_queue; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = g_strdup_printf ("Auto-importing %d files", _tmp8_); + _tmp8_ = g_strdup_printf ("Auto-importing %d files", _tmp7_); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp10_); + directory_monitor_mdbg (_tmp9_); #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 586 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = now_sec (); -#line 586 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - now = (time_t) _tmp11_; + now = (time_t) now_sec (); #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = self->priv->current_import_roll; + _tmp11_ = self->priv->current_import_roll; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp13_ == NULL) { + if (_tmp11_ == NULL) { #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = TRUE; -#line 4474 "LibraryMonitor.c" + _tmp10_ = TRUE; +#line 4751 "LibraryMonitor.c" } else { - time_t _tmp14_; - time_t _tmp15_; + time_t _tmp12_; + time_t _tmp13_; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = now; + _tmp12_ = now; #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = self->priv->last_import_roll_use; + _tmp13_ = 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 4484 "LibraryMonitor.c" + _tmp10_ = (_tmp12_ - _tmp13_) >= ((time_t) LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC); +#line 4761 "LibraryMonitor.c" } #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp12_) { -#line 4488 "LibraryMonitor.c" - BatchImportRoll* _tmp16_; + if (_tmp10_) { +#line 4765 "LibraryMonitor.c" + BatchImportRoll* _tmp14_; #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = batch_import_roll_new (); + _tmp14_ = 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 4496 "LibraryMonitor.c" + self->priv->current_import_roll = _tmp14_; +#line 4773 "LibraryMonitor.c" } #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = now; + _tmp15_ = now; #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->last_import_roll_use = _tmp17_; + self->priv->last_import_roll_use = _tmp15_; #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL); + _tmp16_ = 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 4506 "LibraryMonitor.c" + jobs = _tmp16_; +#line 4783 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashSet* _tmp19_; - GeeIterator* _tmp20_; + GeeHashSet* _tmp17_; + GeeIterator* _tmp18_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = self->priv->import_queue; + _tmp17_ = self->priv->import_queue; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp18_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _file_it = _tmp20_; + _file_it = _tmp18_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4519 "LibraryMonitor.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 4796 "LibraryMonitor.c" + GeeIterator* _tmp19_; GFile* file = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; - GFile* _tmp25_; - gboolean _tmp26_; - GeeArrayList* _tmp27_; + GeeIterator* _tmp20_; + gpointer _tmp21_; + GFile* _tmp22_; + GeeArrayList* _tmp23_; + GFile* _tmp24_; + FileImportJob* _tmp25_; + FileImportJob* _tmp26_; + GeeHashSet* _tmp27_; GFile* _tmp28_; - FileImportJob* _tmp29_; - FileImportJob* _tmp30_; - GeeHashSet* _tmp31_; - GFile* _tmp32_; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _file_it; + _tmp19_ = _file_it; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = gee_iterator_next (_tmp21_); -#line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp19_)) { #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4541 "LibraryMonitor.c" +#line 4814 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _file_it; + _tmp20_ = _file_it; #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp21_ = gee_iterator_get (_tmp20_); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - file = (GFile*) _tmp24_; -#line 593 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = file; + file = (GFile*) _tmp21_; #line 593 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = library_monitor_is_blacklisted (_tmp25_); + _tmp22_ = file; #line 593 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp26_) { + if (library_monitor_is_blacklisted (_tmp22_)) { #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 4559 "LibraryMonitor.c" +#line 4830 "LibraryMonitor.c" } #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = jobs; + _tmp23_ = jobs; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = file; + _tmp24_ = file; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = file_import_job_new (_tmp28_, FALSE, TRUE); + _tmp25_ = file_import_job_new (_tmp24_, FALSE, TRUE); #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_BATCH_IMPORT_JOB, BatchImportJob)); #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _batch_import_job_unref0 (_tmp30_); + _batch_import_job_unref0 (_tmp26_); #line 597 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = self->priv->pending_imports; + _tmp27_ = self->priv->pending_imports; #line 597 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = file; + _tmp28_ = file; #line 597 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 4581 "LibraryMonitor.c" +#line 4852 "LibraryMonitor.c" } #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 4585 "LibraryMonitor.c" +#line 4856 "LibraryMonitor.c" } #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = self->priv->import_queue; + _tmp29_ = self->priv->import_queue; #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = jobs; + _tmp30_ = jobs; #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = self->priv->current_import_roll; + _tmp31_ = self->priv->current_import_roll; #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ITERABLE, GeeIterable), "LibraryMonitor autoimport", NULL, NULL, NULL, NULL, NULL, _tmp35_, NULL); + _tmp32_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable), "LibraryMonitor autoimport", NULL, NULL, NULL, NULL, NULL, _tmp31_, NULL); #line 602 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - importer = _tmp36_; + importer = _tmp32_; #line 604 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = importer; + _tmp33_ = importer; #line 604 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - batch_import_set_untrash_duplicates (_tmp37_, FALSE); + batch_import_set_untrash_duplicates (_tmp33_, FALSE); #line 605 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = importer; + _tmp34_ = importer; #line 605 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - batch_import_set_mark_duplicates_online (_tmp38_, FALSE); + batch_import_set_mark_duplicates_online (_tmp34_, FALSE); #line 606 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = self->priv->batch_import_queue; + _tmp35_ = self->priv->batch_import_queue; #line 606 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = importer; + _tmp36_ = importer; #line 606 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp40_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_); #line 608 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_schedule_next_batch_import (self); #line 610 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -4619,32 +4890,47 @@ 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 4623 "LibraryMonitor.c" +#line 4894 "LibraryMonitor.c" } -static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { +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 4630 "LibraryMonitor.c" +#line 4904 "LibraryMonitor.c" } -static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { +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 4637 "LibraryMonitor.c" +#line 4916 "LibraryMonitor.c" } -static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +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 4644 "LibraryMonitor.c" +#line 4928 "LibraryMonitor.c" } -static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) { +static void +library_monitor_schedule_next_batch_import (LibraryMonitor* self) +{ gboolean _tmp0_ = FALSE; BatchImport* _tmp1_; GeeArrayList* _tmp5_; @@ -4661,7 +4947,7 @@ 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 4665 "LibraryMonitor.c" +#line 4951 "LibraryMonitor.c" } else { GeeArrayList* _tmp2_; gint _tmp3_; @@ -4674,13 +4960,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 4678 "LibraryMonitor.c" +#line 4964 "LibraryMonitor.c" } #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { #line 615 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 4684 "LibraryMonitor.c" +#line 4970 "LibraryMonitor.c" } #line 617 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = self->priv->batch_import_queue; @@ -4706,26 +4992,27 @@ 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 4710 "LibraryMonitor.c" +#line 4996 "LibraryMonitor.c" } -static void library_monitor_discard_current_batch_import (LibraryMonitor* self) { +static void +library_monitor_discard_current_batch_import (LibraryMonitor* self) +{ BatchImport* _tmp0_; gboolean removed = FALSE; GeeArrayList* _tmp1_; BatchImport* _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; - BatchImport* _tmp5_; - guint _tmp6_; - BatchImport* _tmp7_; - guint _tmp8_; - BatchImport* _tmp9_; - guint _tmp10_; - GeeArrayList* _tmp11_; + BatchImport* _tmp4_; + guint _tmp5_; + BatchImport* _tmp6_; + guint _tmp7_; + BatchImport* _tmp8_; + guint _tmp9_; + GeeArrayList* _tmp10_; + gint _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" @@ -4737,55 +5024,55 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self) #line 627 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = self->priv->current_batch_import; #line 627 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 627 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - removed = _tmp3_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); #line 628 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = removed; + _tmp3_ = removed; #line 628 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_tmp4_, "removed"); + _vala_assert (_tmp3_, "removed"); #line 629 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = self->priv->current_batch_import; + _tmp4_ = self->priv->current_batch_import; #line 629 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp6_, NULL, FALSE); + g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp5_, NULL, FALSE); #line 629 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_monitor_on_import_preparing_batch_import_preparing, self); + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_monitor_on_import_preparing_batch_import_preparing, self); #line 630 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = self->priv->current_batch_import; + _tmp6_ = self->priv->current_batch_import; #line 630 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp8_, NULL, FALSE); + g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp7_, NULL, FALSE); #line 630 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_monitor_on_import_progress_batch_import_progress, self); + g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_monitor_on_import_progress_batch_import_progress, self); #line 631 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = self->priv->current_batch_import; + _tmp8_ = self->priv->current_batch_import; #line 631 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp10_, NULL, FALSE); + g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp9_, NULL, FALSE); #line 631 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_monitor_on_import_complete_batch_import_import_complete, self); + g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _library_monitor_on_import_complete_batch_import_import_complete, self); #line 632 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->priv->current_batch_import); #line 632 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->current_batch_import = NULL; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = self->priv->batch_import_queue; + _tmp10_ = self->priv->batch_import_queue; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp13_ == 0) { -#line 4778 "LibraryMonitor.c" - GeeHashSet* _tmp14_; + if (_tmp12_ == 0) { +#line 5063 "LibraryMonitor.c" + GeeHashSet* _tmp13_; #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = self->priv->pending_imports; + _tmp13_ = 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 4784 "LibraryMonitor.c" + gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); +#line 5069 "LibraryMonitor.c" } } -static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { +static void +library_monitor_cancel_batch_imports (LibraryMonitor* self) +{ gint ctr = 0; BatchImport* _tmp16_; GeeHashSet* _tmp18_; @@ -4795,7 +5082,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { ctr = 0; #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4799 "LibraryMonitor.c" +#line 5086 "LibraryMonitor.c" gint _tmp0_; GeeArrayList* _tmp1_; gint _tmp2_; @@ -4823,7 +5110,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { if (!(_tmp0_ < _tmp3_)) { #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 4827 "LibraryMonitor.c" +#line 5114 "LibraryMonitor.c" } #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp4_ = self->priv->batch_import_queue; @@ -4841,7 +5128,7 @@ 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 4845 "LibraryMonitor.c" +#line 5132 "LibraryMonitor.c" gint _tmp10_; #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp10_ = ctr; @@ -4849,7 +5136,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) { ctr = _tmp10_ + 1; #line 650 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 4853 "LibraryMonitor.c" +#line 5140 "LibraryMonitor.c" } #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp11_ = self->priv->batch_import_queue; @@ -4865,70 +5152,72 @@ 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 4869 "LibraryMonitor.c" +#line 5156 "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 4875 "LibraryMonitor.c" +#line 5162 "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 4881 "LibraryMonitor.c" +#line 5168 "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 4887 "LibraryMonitor.c" +#line 5174 "LibraryMonitor.c" } -static void library_monitor_on_import_preparing (LibraryMonitor* self) { +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 (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL], 0); -#line 4896 "LibraryMonitor.c" +#line 5185 "LibraryMonitor.c" } -static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 completed_bytes, guint64 total_bytes) { - guint64 _tmp0_; - guint64 _tmp1_; +static void +library_monitor_on_import_progress (LibraryMonitor* self, + guint64 completed_bytes, + guint64 total_bytes) +{ #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" - _tmp0_ = completed_bytes; -#line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = total_bytes; -#line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, _tmp0_, _tmp1_); -#line 4911 "LibraryMonitor.c" + g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, completed_bytes, total_bytes); +#line 5198 "LibraryMonitor.c" } -static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) { +static void +library_monitor_on_import_complete (LibraryMonitor* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll) +{ 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_; + GeeList* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GeeList* _tmp22_; + gint _tmp23_; + gint _tmp24_; + GeeHashSet* _tmp53_; + gint _tmp54_; + gint _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; GError * _inner_error_ = NULL; #line 672 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_LIBRARY_MONITOR (self)); @@ -4939,286 +5228,271 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor #line 672 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); #line 674 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = batch_import; -#line 674 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = self->priv->current_batch_import; + _tmp0_ = self->priv->current_batch_import; #line 674 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch_import"); -#line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = manifest; + _vala_assert (batch_import == _tmp0_, "batch_import == current_batch_import"); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->all; + _tmp1_ = manifest->all; #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection)); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_strdup_printf ("auto-import batch completed %d", _tmp5_); + _tmp4_ = g_strdup_printf ("auto-import batch completed %d", _tmp3_); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp7_); + directory_monitor_mdbg (_tmp5_); #line 676 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 677 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, (guint64) 0, (guint64) 0); -#line 4966 "LibraryMonitor.c" +#line 5251 "LibraryMonitor.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp8_; - GeeList* _tmp9_; - GeeList* _tmp10_; + GeeList* _tmp6_; + GeeList* _tmp7_; gint _result_size = 0; - GeeList* _tmp11_; - gint _tmp12_; - gint _tmp13_; + GeeList* _tmp8_; + gint _tmp9_; + gint _tmp10_; gint _result_index = 0; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = manifest; + _tmp6_ = manifest->all; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_->all; + _tmp7_ = _g_object_ref0 (_tmp6_); #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _result_list = _tmp7_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_list = _tmp10_; + _tmp8_ = _result_list; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _result_list; + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _tmp12_; + _tmp10_ = _tmp9_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_size = _tmp13_; + _result_size = _tmp10_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _result_index = -1; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 4997 "LibraryMonitor.c" - gint _tmp14_; - gint _tmp15_; - gint _tmp16_; +#line 5279 "LibraryMonitor.c" + gint _tmp11_; + gint _tmp12_; + gint _tmp13_; BatchImportResult* _result_ = NULL; - GeeList* _tmp17_; - gint _tmp18_; - gpointer _tmp19_; - BatchImportResult* _tmp20_; - GFile* _tmp21_; + GeeList* _tmp14_; + gint _tmp15_; + gpointer _tmp16_; + BatchImportResult* _tmp17_; + GFile* _tmp18_; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _result_index; + _tmp11_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_index = _tmp14_ + 1; + _result_index = _tmp11_ + 1; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _result_index; + _tmp12_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _result_size; + _tmp13_ = _result_size; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp15_ < _tmp16_)) { + if (!(_tmp12_ < _tmp13_)) { #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5019 "LibraryMonitor.c" +#line 5301 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = _result_list; + _tmp14_ = _result_list; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _result_index; + _tmp15_ = _result_index; #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = gee_list_get (_tmp17_, _tmp18_); + _tmp16_ = gee_list_get (_tmp14_, _tmp15_); #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = (BatchImportResult*) _tmp19_; + _result_ = (BatchImportResult*) _tmp16_; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _result_; + _tmp17_ = _result_; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _tmp20_->file; + _tmp18_ = _tmp17_->file; #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp21_ != NULL) { -#line 5035 "LibraryMonitor.c" - GeeHashSet* _tmp22_; - BatchImportResult* _tmp23_; - GFile* _tmp24_; + if (_tmp18_ != NULL) { +#line 5317 "LibraryMonitor.c" + GeeHashSet* _tmp19_; + BatchImportResult* _tmp20_; + GFile* _tmp21_; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = self->priv->pending_imports; + _tmp19_ = self->priv->pending_imports; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _result_; + _tmp20_ = _result_; #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_->file; + _tmp21_ = _tmp20_->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 5047 "LibraryMonitor.c" + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); +#line 5329 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5051 "LibraryMonitor.c" +#line 5333 "LibraryMonitor.c" } #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5055 "LibraryMonitor.c" +#line 5337 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = manifest; -#line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _tmp25_->already_imported; + _tmp22_ = manifest->already_imported; #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = _tmp27_; + _tmp24_ = _tmp23_; #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp28_ > 0) { -#line 5067 "LibraryMonitor.c" + if (_tmp24_ > 0) { +#line 5347 "LibraryMonitor.c" GeeArrayList* to_tombstone = NULL; - GeeArrayList* _tmp29_; + GeeArrayList* _tmp25_; #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); + _tmp25_ = 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 5074 "LibraryMonitor.c" + to_tombstone = _tmp25_; +#line 5354 "LibraryMonitor.c" { GeeList* _result_list = NULL; - ImportManifest* _tmp30_; - GeeList* _tmp31_; - GeeList* _tmp32_; + GeeList* _tmp26_; + GeeList* _tmp27_; gint _result_size = 0; - GeeList* _tmp33_; - gint _tmp34_; - gint _tmp35_; + GeeList* _tmp28_; + gint _tmp29_; + gint _tmp30_; gint _result_index = 0; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = manifest; + _tmp26_ = manifest->already_imported; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = _tmp30_->already_imported; + _tmp27_ = _g_object_ref0 (_tmp26_); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = _g_object_ref0 (_tmp31_); + _result_list = _tmp27_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_list = _tmp32_; + _tmp28_ = _result_list; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = _result_list; + _tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_size = _tmp35_; + _result_size = _tmp30_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _result_index = -1; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5105 "LibraryMonitor.c" - gint _tmp36_; - gint _tmp37_; - gint _tmp38_; +#line 5382 "LibraryMonitor.c" + gint _tmp31_; + gint _tmp32_; + gint _tmp33_; BatchImportResult* _result_ = NULL; - GeeList* _tmp39_; - gint _tmp40_; - gpointer _tmp41_; + GeeList* _tmp34_; + gint _tmp35_; + gpointer _tmp36_; GFileInfo* info = NULL; - BatchImportResult* _tmp42_; - GFile* _tmp43_; - GFileInfo* _tmp44_; - GFileInfo* _tmp45_; - GeeArrayList* _tmp50_; - BatchImportResult* _tmp51_; - GFile* _tmp52_; - GFileInfo* _tmp53_; - gint64 _tmp54_; - TombstonedFile* _tmp55_; - TombstonedFile* _tmp56_; + BatchImportResult* _tmp37_; + GFile* _tmp38_; + GFileInfo* _tmp39_; + GFileInfo* _tmp40_; + GeeArrayList* _tmp45_; + BatchImportResult* _tmp46_; + GFile* _tmp47_; + GFileInfo* _tmp48_; + TombstonedFile* _tmp49_; + TombstonedFile* _tmp50_; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _result_index; + _tmp31_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_index = _tmp36_ + 1; + _result_index = _tmp31_ + 1; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = _result_index; + _tmp32_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = _result_size; + _tmp33_ = _result_size; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp37_ < _tmp38_)) { + if (!(_tmp32_ < _tmp33_)) { #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5137 "LibraryMonitor.c" +#line 5413 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = _result_list; + _tmp34_ = _result_list; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = _result_index; + _tmp35_ = _result_index; #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = gee_list_get (_tmp39_, _tmp40_); + _tmp36_ = gee_list_get (_tmp34_, _tmp35_); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = (BatchImportResult*) _tmp41_; + _result_ = (BatchImportResult*) _tmp36_; #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = _result_; + _tmp37_ = _result_; #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = _tmp42_->file; + _tmp38_ = _tmp37_->file; #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp43_); + _tmp39_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp38_); #line 689 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - info = _tmp44_; + info = _tmp39_; #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = info; + _tmp40_ = info; #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp45_ == NULL) { -#line 5159 "LibraryMonitor.c" - BatchImportResult* _tmp46_; - GFile* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; + if (_tmp40_ == NULL) { +#line 5435 "LibraryMonitor.c" + BatchImportResult* _tmp41_; + GFile* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = _result_; + _tmp41_ = _result_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = _tmp46_->file; + _tmp42_ = _tmp41_->file; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp48_ = g_file_get_path (_tmp47_); + _tmp43_ = g_file_get_path (_tmp42_); #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = _tmp48_; + _tmp44_ = _tmp43_; #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_warning ("LibraryMonitor.vala:691: Unable to get info for duplicate file %s", _tmp49_); + g_warning ("LibraryMonitor.vala:691: Unable to get info for duplicate file %s", _tmp44_); #line 691 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp44_); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5182 "LibraryMonitor.c" +#line 5458 "LibraryMonitor.c" } #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp50_ = to_tombstone; -#line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp51_ = _result_; + _tmp45_ = to_tombstone; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp52_ = _tmp51_->file; + _tmp46_ = _result_; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp53_ = info; + _tmp47_ = _tmp46_->file; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp54_ = g_file_info_get_size (_tmp53_); + _tmp48_ = info; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp55_ = tombstoned_file_new (_tmp52_, _tmp54_, NULL); + _tmp49_ = tombstoned_file_new (_tmp47_, g_file_info_get_size (_tmp48_), NULL); #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp56_ = _tmp55_; + _tmp50_ = _tmp49_; #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp56_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_); #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tombstoned_file_unref0 (_tmp56_); + _tombstoned_file_unref0 (_tmp50_); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _batch_import_result_unref0 (_result_); -#line 5206 "LibraryMonitor.c" +#line 5480 "LibraryMonitor.c" } #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_result_list); -#line 5210 "LibraryMonitor.c" +#line 5484 "LibraryMonitor.c" } { - GeeArrayList* _tmp57_; + GeeArrayList* _tmp51_; #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp57_ = to_tombstone; + _tmp51_ = to_tombstone; #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone_entomb_many_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE, &_inner_error_); + tombstone_entomb_many_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_AUTO_DETECTED_DUPLICATE, &_inner_error_); #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5222 "LibraryMonitor.c" +#line 5496 "LibraryMonitor.c" goto __catch496_database_error; } #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5229,25 +5503,25 @@ 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 5233 "LibraryMonitor.c" +#line 5507 "LibraryMonitor.c" } } goto __finally496; __catch496_database_error: { GError* err = NULL; - GError* _tmp58_; + GError* _tmp52_; #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _inner_error_ = NULL; #line 702 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = err; + _tmp52_ = err; #line 702 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - app_window_database_error (_tmp58_); + app_window_database_error (_tmp52_); #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (err); -#line 5251 "LibraryMonitor.c" +#line 5525 "LibraryMonitor.c" } __finally496: #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -5260,91 +5534,85 @@ 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 5264 "LibraryMonitor.c" +#line 5538 "LibraryMonitor.c" } #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_tombstone); -#line 5268 "LibraryMonitor.c" +#line 5542 "LibraryMonitor.c" } #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp59_ = self->priv->pending_imports; + _tmp53_ = self->priv->pending_imports; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp61_ = _tmp60_; + _tmp55_ = _tmp54_; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp62_ = g_strdup_printf ("%d files remain pending for auto-import", _tmp61_); + _tmp56_ = g_strdup_printf ("%d files remain pending for auto-import", _tmp55_); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp63_ = _tmp62_; + _tmp57_ = _tmp56_; #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp63_); + directory_monitor_mdbg (_tmp57_); #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp63_); + _g_free0 (_tmp57_); #line 708 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_discard_current_batch_import (self); #line 709 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_schedule_next_batch_import (self); -#line 5288 "LibraryMonitor.c" +#line 5562 "LibraryMonitor.c" } -void library_monitor_blacklist_file (GFile* file, const gchar* reason) { - const gchar* _tmp0_; - GFile* _tmp1_; +void +library_monitor_blacklist_file (GFile* file, + const gchar* reason) +{ + gchar* _tmp0_; + gchar* _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)); #line 725 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (reason != NULL); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = reason; + _tmp0_ = g_file_get_path (file); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = file; + _tmp1_ = _tmp0_; #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = g_file_get_path (_tmp1_); + _tmp2_ = g_strdup_printf ("[%s] Blacklisting %s", reason, _tmp1_); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp3_ = _tmp2_; #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = g_strdup_printf ("[%s] Blacklisting %s", _tmp0_, _tmp3_); -#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_; -#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp5_); -#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp5_); + directory_monitor_mdbg (_tmp3_); #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp3_); -#line 5322 "LibraryMonitor.c" +#line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _g_free0 (_tmp1_); +#line 5593 "LibraryMonitor.c" { - GeeHashSet* _tmp6_; + GeeHashSet* _tmp4_; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = library_monitor_blacklist; + _tmp4_ = library_monitor_blacklist; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_lock (&__lock_library_monitor_blacklist); -#line 5329 "LibraryMonitor.c" +#line 5600 "LibraryMonitor.c" { - GeeHashSet* _tmp7_; - GFile* _tmp8_; -#line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = library_monitor_blacklist; + GeeHashSet* _tmp5_; #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = file; + _tmp5_ = library_monitor_blacklist; #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 5339 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 5607 "LibraryMonitor.c" } __finally497: { - GeeHashSet* _tmp9_; + GeeHashSet* _tmp6_; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = library_monitor_blacklist; + _tmp6_ = library_monitor_blacklist; #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5348 "LibraryMonitor.c" +#line 5616 "LibraryMonitor.c" } #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5354,77 +5622,64 @@ 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 5358 "LibraryMonitor.c" +#line 5626 "LibraryMonitor.c" } } } -void library_monitor_unblacklist_file (GFile* file) { +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 5368 "LibraryMonitor.c" +#line 5638 "LibraryMonitor.c" { 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 5375 "LibraryMonitor.c" +#line 5645 "LibraryMonitor.c" { gboolean _tmp1_ = 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" - _tmp3_ = file; -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_); + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file)) { +#line 5653 "LibraryMonitor.c" + HashTimedQueue* _tmp3_; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp4_) { -#line 5389 "LibraryMonitor.c" - HashTimedQueue* _tmp5_; - GFile* _tmp6_; - gboolean _tmp7_; + _tmp3_ = library_monitor_to_unblacklist; #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = library_monitor_to_unblacklist; -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = file; -#line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 5401 "LibraryMonitor.c" + _tmp1_ = !timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_TIMED_QUEUE, TimedQueue), file); +#line 5659 "LibraryMonitor.c" } else { #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5405 "LibraryMonitor.c" +#line 5663 "LibraryMonitor.c" } #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5409 "LibraryMonitor.c" - HashTimedQueue* _tmp8_; - GFile* _tmp9_; -#line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = library_monitor_to_unblacklist; +#line 5667 "LibraryMonitor.c" + HashTimedQueue* _tmp4_; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = file; + _tmp4_ = library_monitor_to_unblacklist; #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TIMED_QUEUE, TimedQueue), _tmp9_); -#line 5418 "LibraryMonitor.c" + timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TIMED_QUEUE, TimedQueue), file); +#line 5673 "LibraryMonitor.c" } } __finally498: { - GeeHashSet* _tmp10_; + GeeHashSet* _tmp5_; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = library_monitor_blacklist; + _tmp5_ = library_monitor_blacklist; #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5428 "LibraryMonitor.c" +#line 5683 "LibraryMonitor.c" } #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5434,47 +5689,43 @@ void library_monitor_unblacklist_file (GFile* file) { g_clear_error (&_inner_error_); #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5438 "LibraryMonitor.c" +#line 5693 "LibraryMonitor.c" } } } -static void library_monitor_on_unblacklist_file (GFile* file) { +static void +library_monitor_on_unblacklist_file (GFile* file) +{ gboolean removed = FALSE; GError * _inner_error_ = NULL; #line 741 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 5449 "LibraryMonitor.c" +#line 5706 "LibraryMonitor.c" { 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 5456 "LibraryMonitor.c" +#line 5713 "LibraryMonitor.c" { 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" - _tmp2_ = file; -#line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 5469 "LibraryMonitor.c" + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 5720 "LibraryMonitor.c" } __finally499: { - GeeHashSet* _tmp4_; + GeeHashSet* _tmp2_; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = library_monitor_blacklist; + _tmp2_ = library_monitor_blacklist; #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5478 "LibraryMonitor.c" +#line 5729 "LibraryMonitor.c" } #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -5484,120 +5735,112 @@ 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 5488 "LibraryMonitor.c" +#line 5739 "LibraryMonitor.c" } } #line 747 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (removed) { -#line 5493 "LibraryMonitor.c" - GFile* _tmp5_; +#line 5744 "LibraryMonitor.c" + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _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" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp3_ = g_file_get_path (file); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = g_strdup_printf ("Blacklist for %s removed", _tmp7_); + _tmp5_ = g_strdup_printf ("Blacklist for %s removed", _tmp4_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp9_); + directory_monitor_mdbg (_tmp6_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp6_); #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); -#line 5515 "LibraryMonitor.c" + _g_free0 (_tmp4_); +#line 5763 "LibraryMonitor.c" } else { - GFile* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; -#line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = file; + gchar* _tmp7_; + gchar* _tmp8_; #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = g_file_get_path (_tmp10_); + _tmp7_ = g_file_get_path (file); #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp12_); + g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp8_); #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp12_); -#line 5530 "LibraryMonitor.c" + _g_free0 (_tmp8_); +#line 5775 "LibraryMonitor.c" } } -gboolean library_monitor_is_blacklisted (GFile* file) { +gboolean +library_monitor_is_blacklisted (GFile* file) +{ gboolean result = FALSE; GError * _inner_error_ = NULL; #line 753 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); -#line 5540 "LibraryMonitor.c" +#line 5787 "LibraryMonitor.c" { GeeHashSet* _tmp0_; - gboolean _tmp6_ = FALSE; + gboolean _tmp4_ = 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 5548 "LibraryMonitor.c" +#line 5795 "LibraryMonitor.c" { 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" - _tmp2_ = file; -#line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 5561 "LibraryMonitor.c" + result = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), file); +#line 5802 "LibraryMonitor.c" { - GeeHashSet* _tmp4_; + GeeHashSet* _tmp2_; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = library_monitor_blacklist; + _tmp2_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5568 "LibraryMonitor.c" +#line 5809 "LibraryMonitor.c" } #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5572 "LibraryMonitor.c" +#line 5813 "LibraryMonitor.c" } __finally500: { - GeeHashSet* _tmp5_; + GeeHashSet* _tmp3_; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = library_monitor_blacklist; + _tmp3_ = library_monitor_blacklist; #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_unlock (&__lock_library_monitor_blacklist); -#line 5581 "LibraryMonitor.c" +#line 5822 "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); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_clear_error (&_inner_error_); #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - return _tmp6_; -#line 5589 "LibraryMonitor.c" + return _tmp4_; +#line 5830 "LibraryMonitor.c" } } -static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFile* file) { +static gboolean +library_monitor_is_supported_filetype (LibraryMonitor* self, + GFile* file) +{ gboolean result = FALSE; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; - GFile* _tmp2_; + MediaSourceCollection* _tmp2_; MediaSourceCollection* _tmp3_; - MediaSourceCollection* _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; #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" @@ -5607,29 +5850,29 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = _tmp0_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + _tmp2_ = media_collection_registry_get_collection_for_file (_tmp1_, file); #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = media_collection_registry_get_collection_for_file (_tmp1_, _tmp2_); -#line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_ != NULL; + _tmp4_ = _tmp3_ != NULL; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_collection_unref0 (_tmp4_); + _data_collection_unref0 (_tmp3_); #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _media_collection_registry_unref0 (_tmp1_); #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - result = _tmp5_; + result = _tmp4_; #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return result; -#line 5626 "LibraryMonitor.c" +#line 5867 "LibraryMonitor.c" } -static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { +static void +library_monitor_import_unrepresented_files (LibraryMonitor* self) +{ gboolean _tmp0_; GeeArrayList* to_import = NULL; - GeeArrayList* _tmp42_; + GeeArrayList* _tmp36_; #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" @@ -5638,11 +5881,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { if (!_tmp0_) { #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 5642 "LibraryMonitor.c" +#line 5885 "LibraryMonitor.c" } #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" to_import = NULL; -#line 5646 "LibraryMonitor.c" +#line 5889 "LibraryMonitor.c" { GeeIterator* _file_it = NULL; GeeCollection* _tmp1_; @@ -5663,274 +5906,259 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { _file_it = _tmp4_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5667 "LibraryMonitor.c" +#line 5910 "LibraryMonitor.c" GeeIterator* _tmp5_; - gboolean _tmp6_; GFile* file = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; + GeeIterator* _tmp6_; + gpointer _tmp7_; GFileInfo* info = NULL; - GFile* _tmp9_; - GFileInfo* _tmp10_; - gboolean _tmp11_ = FALSE; - GFileInfo* _tmp12_; - GeeHashSet* _tmp15_; + GFile* _tmp8_; + GFileInfo* _tmp9_; + gboolean _tmp10_ = FALSE; + GFileInfo* _tmp11_; + GeeHashSet* _tmp13_; + GFile* _tmp14_; + TombstoneSourceCollection* _tmp15_; GFile* _tmp16_; - gboolean _tmp17_; - TombstoneSourceCollection* _tmp18_; - GFile* _tmp19_; - gboolean _tmp20_; gboolean represented = FALSE; - gboolean _tmp35_; - GFile* _tmp36_; - gboolean _tmp37_; - GeeArrayList* _tmp38_; - GeeArrayList* _tmp40_; - GFile* _tmp41_; + gboolean _tmp30_; + GFile* _tmp31_; + GeeArrayList* _tmp32_; + GeeArrayList* _tmp34_; + GFile* _tmp35_; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp5_ = _file_it; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_iterator_next (_tmp5_); -#line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp5_)) { #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5699 "LibraryMonitor.c" +#line 5936 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _file_it; + _tmp6_ = _file_it; #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - file = (GFile*) _tmp8_; + file = (GFile*) _tmp7_; #line 771 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = file; + _tmp8_ = file; #line 771 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp9_); + _tmp9_ = directory_monitor_get_file_info (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp8_); #line 771 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - info = _tmp10_; + info = _tmp9_; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = info; + _tmp11_ = info; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp12_ == NULL) { + if (_tmp11_ == NULL) { #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = TRUE; -#line 5719 "LibraryMonitor.c" + _tmp10_ = TRUE; +#line 5956 "LibraryMonitor.c" } else { - GFileInfo* _tmp13_; - GFileType _tmp14_; -#line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = info; + GFileInfo* _tmp12_; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = g_file_info_get_file_type (_tmp13_); + _tmp12_ = info; #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR; -#line 5729 "LibraryMonitor.c" + _tmp10_ = g_file_info_get_file_type (_tmp12_) != G_FILE_TYPE_REGULAR; +#line 5963 "LibraryMonitor.c" } #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp11_) { + if (_tmp10_) { #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5739 "LibraryMonitor.c" +#line 5973 "LibraryMonitor.c" } #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = self->priv->pending_imports; -#line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = file; + _tmp13_ = self->priv->pending_imports; #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); + _tmp14_ = file; #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp17_) { + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_)) { #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5755 "LibraryMonitor.c" +#line 5987 "LibraryMonitor.c" } #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = tombstone_global; -#line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = file; + _tmp15_ = tombstone_global; #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = tombstone_source_collection_matches (_tmp18_, _tmp19_); + _tmp16_ = file; #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp20_) { + if (tombstone_source_collection_matches (_tmp15_, _tmp16_)) { #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5771 "LibraryMonitor.c" +#line 6001 "LibraryMonitor.c" } #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = FALSE; -#line 5775 "LibraryMonitor.c" +#line 6005 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp21_; - GeeList* _tmp22_; + GeeList* _tmp17_; + GeeList* _tmp18_; gint _monitor_size = 0; - GeeList* _tmp23_; - gint _tmp24_; - gint _tmp25_; + GeeList* _tmp19_; + gint _tmp20_; + gint _tmp21_; gint _monitor_index = 0; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = self->priv->monitors; + _tmp17_ = self->priv->monitors; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = _g_object_ref0 (_tmp21_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp22_; + _monitor_list = _tmp18_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _monitor_list; + _tmp19_ = _monitor_list; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection)); #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp25_; + _monitor_size = _tmp21_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 5803 "LibraryMonitor.c" - gint _tmp26_; - gint _tmp27_; - gint _tmp28_; +#line 6033 "LibraryMonitor.c" + gint _tmp22_; + gint _tmp23_; + gint _tmp24_; MediaMonitor* monitor = NULL; - GeeList* _tmp29_; - gint _tmp30_; - gpointer _tmp31_; - MediaMonitor* _tmp32_; - GFile* _tmp33_; - gboolean _tmp34_; + GeeList* _tmp25_; + gint _tmp26_; + gpointer _tmp27_; + MediaMonitor* _tmp28_; + GFile* _tmp29_; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _monitor_index; + _tmp22_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp26_ + 1; + _monitor_index = _tmp22_ + 1; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _monitor_index; + _tmp23_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = _monitor_size; + _tmp24_ = _monitor_size; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp27_ < _tmp28_)) { + if (!(_tmp23_ < _tmp24_)) { #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5826 "LibraryMonitor.c" +#line 6055 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _monitor_list; + _tmp25_ = _monitor_list; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = _monitor_index; + _tmp26_ = _monitor_index; #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = gee_list_get (_tmp29_, _tmp30_); + _tmp27_ = gee_list_get (_tmp25_, _tmp26_); #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp31_; + monitor = (MediaMonitor*) _tmp27_; #line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = monitor; + _tmp28_ = monitor; #line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = file; + _tmp29_ = file; #line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = media_monitor_is_file_represented (_tmp32_, _tmp33_); -#line 783 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp34_) { + if (media_monitor_is_file_represented (_tmp28_, _tmp29_)) { #line 784 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" represented = TRUE; #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 5850 "LibraryMonitor.c" +#line 6077 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 5854 "LibraryMonitor.c" +#line 6081 "LibraryMonitor.c" } #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 5858 "LibraryMonitor.c" +#line 6085 "LibraryMonitor.c" } #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = represented; + _tmp30_ = represented; #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp35_) { + if (_tmp30_) { #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5870 "LibraryMonitor.c" +#line 6097 "LibraryMonitor.c" } #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = file; + _tmp31_ = file; #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = library_monitor_is_supported_filetype (self, _tmp36_); -#line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp37_) { + if (!library_monitor_is_supported_filetype (self, _tmp31_)) { #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 5884 "LibraryMonitor.c" +#line 6109 "LibraryMonitor.c" } #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = to_import; + _tmp32_ = to_import; #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp38_ == NULL) { -#line 5890 "LibraryMonitor.c" - GeeArrayList* _tmp39_; + if (_tmp32_ == NULL) { +#line 6115 "LibraryMonitor.c" + GeeArrayList* _tmp33_; #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); + _tmp33_ = 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 5898 "LibraryMonitor.c" + to_import = _tmp33_; +#line 6123 "LibraryMonitor.c" } #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = to_import; + _tmp34_ = to_import; #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = file; + _tmp35_ = file; #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (info); #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (file); -#line 5910 "LibraryMonitor.c" +#line 6135 "LibraryMonitor.c" } #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_file_it); -#line 5914 "LibraryMonitor.c" +#line 6139 "LibraryMonitor.c" } #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = to_import; + _tmp36_ = to_import; #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp42_ != NULL) { -#line 5920 "LibraryMonitor.c" - GeeArrayList* _tmp43_; + if (_tmp36_ != NULL) { +#line 6145 "LibraryMonitor.c" + GeeArrayList* _tmp37_; #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = to_import; + _tmp37_ = 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 5926 "LibraryMonitor.c" + library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); +#line 6151 "LibraryMonitor.c" } #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (to_import); -#line 5930 "LibraryMonitor.c" +#line 6155 "LibraryMonitor.c" } -static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, GFile* file) { +static void +library_monitor_runtime_unknown_file_discovered (LibraryMonitor* self, + GFile* file) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp2_; @@ -5942,84 +6170,65 @@ 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 5946 "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 5955 "LibraryMonitor.c" + _tmp1_ = library_monitor_is_supported_filetype (self, file); +#line 6176 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp1_ = FALSE; -#line 5959 "LibraryMonitor.c" +#line 6180 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp1_) { -#line 5963 "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" - _tmp6_ = file; +#line 6184 "LibraryMonitor.c" + TombstoneSourceCollection* _tmp3_; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = tombstone_source_collection_matches (_tmp5_, _tmp6_); + _tmp3_ = tombstone_global; #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = !_tmp7_; -#line 5975 "LibraryMonitor.c" + _tmp0_ = !tombstone_source_collection_matches (_tmp3_, file); +#line 6190 "LibraryMonitor.c" } else { #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = FALSE; -#line 5979 "LibraryMonitor.c" +#line 6194 "LibraryMonitor.c" } #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 5983 "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 6198 "LibraryMonitor.c" + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = g_file_get_path (_tmp8_); + _tmp4_ = g_file_get_path (file); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp5_ = _tmp4_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = g_strdup_printf ("Unknown file %s discovered, enqueuing for import", _tmp10_); + _tmp6_ = g_strdup_printf ("Unknown file %s discovered, enqueuing for import", _tmp5_); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp12_); + directory_monitor_mdbg (_tmp7_); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp7_); #line 810 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp10_); -#line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = file; + _g_free0 (_tmp5_); #line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_enqueue_import (self, _tmp13_); -#line 6010 "LibraryMonitor.c" + library_monitor_enqueue_import (self, file); +#line 6219 "LibraryMonitor.c" } } -static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GFile* file, GFileInfo* info) { +static void +library_monitor_real_notify_file_created (DirectoryMonitor* base, + GFile* file, + GFileInfo* info) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp19_; - gboolean _tmp98_; - GFile* _tmp100_; - GFileInfo* _tmp101_; + gboolean _tmp12_; + gboolean _tmp83_; #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" @@ -6027,260 +6236,231 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF #line 815 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 6036 "LibraryMonitor.c" - GFile* _tmp2_; - GFileInfo* _tmp3_; -#line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = info; -#line 817 "/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), _tmp2_, _tmp3_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); #line 819 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6047 "LibraryMonitor.c" +#line 6245 "LibraryMonitor.c" } #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6051 "LibraryMonitor.c" +#line 6249 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp4_; - GeeList* _tmp5_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp5_; + _monitor_list = _tmp1_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _monitor_list; + _tmp2_ = _monitor_list; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp8_; + _monitor_size = _tmp4_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6079 "LibraryMonitor.c" - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 6277 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; - MediaMonitor* _tmp15_; - GFile* _tmp16_; - GFileInfo* _tmp17_; - gboolean _tmp18_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp5_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp9_ + 1; + _monitor_index = _tmp5_ + 1; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_index; + _tmp6_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_size; + _tmp7_ = _monitor_size; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp6_ < _tmp7_)) { #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6103 "LibraryMonitor.c" +#line 6298 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_list; + _tmp8_ = _monitor_list; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _monitor_index; + _tmp9_ = _monitor_index; #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp14_; -#line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = monitor; -#line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = file; -#line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = info; + monitor = (MediaMonitor*) _tmp10_; #line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = media_monitor_notify_file_created (_tmp15_, _tmp16_, _tmp17_); + _tmp11_ = monitor; #line 824 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp18_) { + if (media_monitor_notify_file_created (_tmp11_, file, info)) { #line 825 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6129 "LibraryMonitor.c" +#line 6318 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6133 "LibraryMonitor.c" +#line 6322 "LibraryMonitor.c" } #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6137 "LibraryMonitor.c" +#line 6326 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = known; + _tmp12_ = known; #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp19_) { -#line 6143 "LibraryMonitor.c" + if (!_tmp12_) { +#line 6332 "LibraryMonitor.c" GeeHashSet* all_candidates = NULL; - gboolean _tmp78_ = FALSE; - gboolean _tmp79_ = FALSE; - gboolean _tmp80_; + gboolean _tmp65_ = FALSE; + gboolean _tmp66_ = FALSE; + gboolean _tmp67_; #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" all_candidates = NULL; -#line 6150 "LibraryMonitor.c" +#line 6339 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp20_; - GeeList* _tmp21_; + GeeList* _tmp13_; + GeeList* _tmp14_; gint _monitor_size = 0; - GeeList* _tmp22_; - gint _tmp23_; - gint _tmp24_; + GeeList* _tmp15_; + gint _tmp16_; + gint _tmp17_; gint _monitor_index = 0; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = self->priv->monitors; + _tmp13_ = self->priv->monitors; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = _g_object_ref0 (_tmp20_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp21_; + _monitor_list = _tmp14_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = _monitor_list; + _tmp15_ = _monitor_list; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp24_; + _monitor_size = _tmp17_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6178 "LibraryMonitor.c" - gint _tmp25_; - gint _tmp26_; - gint _tmp27_; +#line 6367 "LibraryMonitor.c" + gint _tmp18_; + gint _tmp19_; + gint _tmp20_; MediaMonitor* monitor = NULL; - GeeList* _tmp28_; - gint _tmp29_; - gpointer _tmp30_; + GeeList* _tmp21_; + gint _tmp22_; + gpointer _tmp23_; MediaMonitorDiscoveredFile _result_ = 0; GeeCollection* candidates = NULL; - MediaMonitor* _tmp31_; - GFile* _tmp32_; - GFileInfo* _tmp33_; - MediaMonitorDiscoveredFile _tmp34_ = 0; - GeeCollection* _tmp35_; - gboolean _tmp36_ = FALSE; - MediaMonitorDiscoveredFile _tmp37_; + MediaMonitor* _tmp24_; + MediaMonitorDiscoveredFile _tmp25_ = 0; + GeeCollection* _tmp26_; + gboolean _tmp27_ = FALSE; + MediaMonitorDiscoveredFile _tmp28_; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _monitor_index; + _tmp18_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp25_ + 1; + _monitor_index = _tmp18_ + 1; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = _monitor_index; + _tmp19_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = _monitor_size; + _tmp20_ = _monitor_size; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp26_ < _tmp27_)) { + if (!(_tmp19_ < _tmp20_)) { #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6207 "LibraryMonitor.c" +#line 6394 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = _monitor_list; + _tmp21_ = _monitor_list; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _monitor_index; + _tmp22_ = _monitor_index; #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = gee_list_get (_tmp28_, _tmp29_); + _tmp23_ = gee_list_get (_tmp21_, _tmp22_); #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp30_; + monitor = (MediaMonitor*) _tmp23_; #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = monitor; + _tmp24_ = monitor; #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = file; + _tmp26_ = media_monitor_candidates_for_unknown_file (_tmp24_, file, info, &_tmp25_); #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = info; + _result_ = _tmp25_; #line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = media_monitor_candidates_for_unknown_file (_tmp31_, _tmp32_, _tmp33_, &_tmp34_); -#line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _result_ = _tmp34_; -#line 836 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidates = _tmp35_; + candidates = _tmp26_; #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = _result_; + _tmp28_ = _result_; #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp37_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { + if (_tmp28_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) { #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = TRUE; -#line 6235 "LibraryMonitor.c" + _tmp27_ = TRUE; +#line 6418 "LibraryMonitor.c" } else { - MediaMonitorDiscoveredFile _tmp38_; + MediaMonitorDiscoveredFile _tmp29_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = _result_; + _tmp29_ = _result_; #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = _tmp38_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; -#line 6242 "LibraryMonitor.c" + _tmp27_ = _tmp29_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE; +#line 6425 "LibraryMonitor.c" } #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp36_) { -#line 6246 "LibraryMonitor.c" - MediaMonitor* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - MediaMonitorDiscoveredFile _tmp42_; - GEnumValue* _tmp43_; - GFile* _tmp44_; - gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; + if (_tmp27_) { +#line 6429 "LibraryMonitor.c" + MediaMonitor* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + MediaMonitorDiscoveredFile _tmp33_; + GEnumValue* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = monitor; -#line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = media_monitor_to_string (_tmp39_); + _tmp30_ = monitor; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = _tmp40_; + _tmp31_ = media_monitor_to_string (_tmp30_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = _result_; + _tmp32_ = _tmp31_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp43_ = g_enum_get_value (g_type_class_ref (MEDIA_MONITOR_TYPE_DISCOVERED_FILE), _tmp42_); + _tmp33_ = _result_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = file; + _tmp34_ = g_enum_get_value (g_type_class_ref (MEDIA_MONITOR_TYPE_DISCOVERED_FILE), _tmp33_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = g_file_get_path (_tmp44_); + _tmp35_ = g_file_get_path (file); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = _tmp45_; + _tmp36_ = _tmp35_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = g_strdup_printf ("%s %s created file %s", _tmp41_, (_tmp43_ != NULL) ? _tmp43_->value_name : NULL, _tmp46_); + _tmp37_ = g_strdup_printf ("%s %s created file %s", _tmp32_, (_tmp34_ != NULL) ? _tmp34_->value_name : NULL, _tmp36_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp48_ = _tmp47_; + _tmp38_ = _tmp37_; #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp48_); + directory_monitor_mdbg (_tmp38_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp38_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp36_); #line 840 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp32_); #line 843 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -6289,154 +6469,145 @@ 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 6293 "LibraryMonitor.c" +#line 6473 "LibraryMonitor.c" } else { - gboolean _tmp49_ = FALSE; - GeeCollection* _tmp50_; + gboolean _tmp39_ = FALSE; + GeeCollection* _tmp40_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp50_ = candidates; + _tmp40_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp50_ != NULL) { -#line 6301 "LibraryMonitor.c" - GeeCollection* _tmp51_; - gint _tmp52_; - gint _tmp53_; + if (_tmp40_ != NULL) { +#line 6481 "LibraryMonitor.c" + GeeCollection* _tmp41_; + gint _tmp42_; + gint _tmp43_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp51_ = candidates; + _tmp41_ = candidates; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp52_ = gee_collection_get_size (_tmp51_); + _tmp42_ = gee_collection_get_size (_tmp41_); #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp53_ = _tmp52_; + _tmp43_ = _tmp42_; #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = _tmp53_ > 0; -#line 6313 "LibraryMonitor.c" + _tmp39_ = _tmp43_ > 0; +#line 6493 "LibraryMonitor.c" } else { #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp49_ = FALSE; -#line 6317 "LibraryMonitor.c" + _tmp39_ = FALSE; +#line 6497 "LibraryMonitor.c" } #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp49_) { -#line 6321 "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_; + if (_tmp39_) { +#line 6501 "LibraryMonitor.c" + MediaMonitor* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + GeeCollection* _tmp47_; + gint _tmp48_; + gint _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + GeeHashSet* _tmp54_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp54_ = monitor; + _tmp44_ = monitor; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp55_ = media_monitor_to_string (_tmp54_); + _tmp45_ = media_monitor_to_string (_tmp44_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp56_ = _tmp55_; + _tmp46_ = _tmp45_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp57_ = candidates; + _tmp47_ = candidates; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp58_ = gee_collection_get_size (_tmp57_); + _tmp48_ = gee_collection_get_size (_tmp47_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp59_ = _tmp58_; + _tmp49_ = _tmp48_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp60_ = file; + _tmp50_ = g_file_get_path (file); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp61_ = g_file_get_path (_tmp60_); + _tmp51_ = _tmp50_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp62_ = _tmp61_; + _tmp52_ = g_strdup_printf ("%s suggests %d candidates for created file %s", _tmp46_, _tmp49_, _tmp51_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp63_ = g_strdup_printf ("%s suggests %d candidates for created file %s", _tmp56_, _tmp59_, _tmp62_); -#line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp64_ = _tmp63_; + _tmp53_ = _tmp52_; #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp64_); + directory_monitor_mdbg (_tmp53_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp64_); + _g_free0 (_tmp53_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp51_); #line 847 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp46_); #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp65_ = all_candidates; + _tmp54_ = all_candidates; #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp65_ == NULL) { -#line 6368 "LibraryMonitor.c" - GeeHashSet* _tmp66_; + if (_tmp54_ == NULL) { +#line 6545 "LibraryMonitor.c" + GeeHashSet* _tmp55_; #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); + _tmp55_ = 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 6376 "LibraryMonitor.c" + all_candidates = _tmp55_; +#line 6553 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp67_; - GeeIterator* _tmp68_; + GeeCollection* _tmp56_; + GeeIterator* _tmp57_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp67_ = candidates; + _tmp56_ = candidates; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp68_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp57_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ITERABLE, GeeIterable)); #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _candidate_it = _tmp68_; + _candidate_it = _tmp57_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6390 "LibraryMonitor.c" - GeeIterator* _tmp69_; - gboolean _tmp70_; +#line 6567 "LibraryMonitor.c" + GeeIterator* _tmp58_; Monitorable* candidate = NULL; - GeeIterator* _tmp71_; - gpointer _tmp72_; - MediaMonitor* _tmp73_; - Monitorable* _tmp74_; - gboolean _tmp75_; -#line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp69_ = _candidate_it; + GeeIterator* _tmp59_; + gpointer _tmp60_; + MediaMonitor* _tmp61_; + Monitorable* _tmp62_; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp70_ = gee_iterator_next (_tmp69_); + _tmp58_ = _candidate_it; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp70_) { + if (!gee_iterator_next (_tmp58_)) { #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6407 "LibraryMonitor.c" +#line 6580 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp71_ = _candidate_it; + _tmp59_ = _candidate_it; #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp72_ = gee_iterator_get (_tmp71_); + _tmp60_ = gee_iterator_get (_tmp59_); #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidate = (Monitorable*) _tmp72_; + candidate = (Monitorable*) _tmp60_; #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp73_ = monitor; + _tmp61_ = monitor; #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp74_ = candidate; + _tmp62_ = candidate; #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp75_ = media_monitor_is_offline (_tmp73_, _tmp74_); -#line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp75_) { -#line 6423 "LibraryMonitor.c" - GeeHashSet* _tmp76_; - Monitorable* _tmp77_; + if (media_monitor_is_offline (_tmp61_, _tmp62_)) { +#line 6594 "LibraryMonitor.c" + GeeHashSet* _tmp63_; + Monitorable* _tmp64_; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp76_ = all_candidates; + _tmp63_ = all_candidates; #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp77_ = candidate; + _tmp64_ = 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 6432 "LibraryMonitor.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_); +#line 6603 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 6436 "LibraryMonitor.c" +#line 6607 "LibraryMonitor.c" } #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 6440 "LibraryMonitor.c" +#line 6611 "LibraryMonitor.c" } } } @@ -6444,260 +6615,246 @@ 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 6448 "LibraryMonitor.c" +#line 6619 "LibraryMonitor.c" } #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6452 "LibraryMonitor.c" +#line 6623 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp80_ = known; + _tmp67_ = known; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp80_) { -#line 6458 "LibraryMonitor.c" - GeeHashSet* _tmp81_; + if (!_tmp67_) { +#line 6629 "LibraryMonitor.c" + GeeHashSet* _tmp68_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp81_ = all_candidates; + _tmp68_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp79_ = _tmp81_ != NULL; -#line 6464 "LibraryMonitor.c" + _tmp66_ = _tmp68_ != NULL; +#line 6635 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp79_ = FALSE; -#line 6468 "LibraryMonitor.c" + _tmp66_ = FALSE; +#line 6639 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp79_) { -#line 6472 "LibraryMonitor.c" - GeeHashSet* _tmp82_; - gint _tmp83_; - gint _tmp84_; + if (_tmp66_) { +#line 6643 "LibraryMonitor.c" + GeeHashSet* _tmp69_; + gint _tmp70_; + gint _tmp71_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp82_ = all_candidates; + _tmp69_ = all_candidates; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp83_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp70_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp84_ = _tmp83_; + _tmp71_ = _tmp70_; #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp78_ = _tmp84_ > 0; -#line 6484 "LibraryMonitor.c" + _tmp65_ = _tmp71_ > 0; +#line 6655 "LibraryMonitor.c" } else { #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp78_ = FALSE; -#line 6488 "LibraryMonitor.c" + _tmp65_ = FALSE; +#line 6659 "LibraryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp78_) { -#line 6492 "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; + if (_tmp65_) { +#line 6663 "LibraryMonitor.c" + GeeHashSet* _tmp72_; + gint _tmp73_; + gint _tmp74_; + gchar* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + Workers* _tmp79_; + GeeHashSet* _tmp80_; + LibraryMonitorRuntimeFindMoveJob* _tmp81_; + LibraryMonitorRuntimeFindMoveJob* _tmp82_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp86_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp72_ = all_candidates; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp87_ = _tmp86_; + _tmp73_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp88_ = file; + _tmp74_ = _tmp73_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp89_ = g_file_get_path (_tmp88_); + _tmp75_ = g_file_get_path (file); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp90_ = _tmp89_; + _tmp76_ = _tmp75_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp91_ = g_strdup_printf ("%d candidates for created file %s being checksummed", _tmp87_, _tmp90_); + _tmp77_ = g_strdup_printf ("%d candidates for created file %s being checksummed", _tmp74_, _tmp76_); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp92_ = _tmp91_; + _tmp78_ = _tmp77_; #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - directory_monitor_mdbg (_tmp92_); + directory_monitor_mdbg (_tmp78_); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp92_); + _g_free0 (_tmp78_); #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp90_); -#line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp93_ = self->priv->workers; + _g_free0 (_tmp76_); #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp94_ = file; + _tmp79_ = self->priv->workers; #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp95_ = all_candidates; + _tmp80_ = all_candidates; #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp96_ = library_monitor_runtime_find_move_job_new (self, _tmp94_, G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp81_ = library_monitor_runtime_find_move_job_new (self, file, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection)); #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp97_ = _tmp96_; + _tmp82_ = _tmp81_; #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - workers_enqueue (_tmp93_, G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, TYPE_BACKGROUND_JOB, BackgroundJob)); + workers_enqueue (_tmp79_, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_BACKGROUND_JOB, BackgroundJob)); #line 864 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _background_job_unref0 (_tmp97_); + _background_job_unref0 (_tmp82_); #line 866 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; -#line 6544 "LibraryMonitor.c" +#line 6709 "LibraryMonitor.c" } #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (all_candidates); -#line 6548 "LibraryMonitor.c" +#line 6713 "LibraryMonitor.c" } #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp98_ = known; + _tmp83_ = known; #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp98_) { -#line 6554 "LibraryMonitor.c" - GFile* _tmp99_; + if (!_tmp83_) { #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 6560 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 6721 "LibraryMonitor.c" } #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp100_ = file; -#line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 6568 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); +#line 6725 "LibraryMonitor.c" } -static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, BackgroundJob* j) { +static void +library_monitor_on_runtime_find_move_completed (LibraryMonitor* self, + BackgroundJob* j) +{ LibraryMonitorRuntimeFindMoveJob* job = NULL; - BackgroundJob* _tmp0_; + LibraryMonitorRuntimeFindMoveJob* _tmp0_; LibraryMonitorRuntimeFindMoveJob* _tmp1_; - LibraryMonitorRuntimeFindMoveJob* _tmp2_; - GError* _tmp3_; - LibraryMonitorRuntimeFindMoveJob* _tmp11_; - Monitorable* _tmp12_; + GError* _tmp2_; + LibraryMonitorRuntimeFindMoveJob* _tmp10_; + Monitorable* _tmp11_; #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" g_return_if_fail (IS_BACKGROUND_JOB (j)); #line 877 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = j; -#line 877 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob)); + _tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob)); #line 877 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - job = _tmp1_; + job = _tmp0_; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = job; + _tmp1_ = job; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->err; + _tmp2_ = _tmp1_->err; #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp3_ != NULL) { -#line 6596 "LibraryMonitor.c" - LibraryMonitorRuntimeFindMoveJob* _tmp4_; - GFile* _tmp5_; + if (_tmp2_ != NULL) { +#line 6753 "LibraryMonitor.c" + LibraryMonitorRuntimeFindMoveJob* _tmp3_; + GFile* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; - gchar* _tmp7_; - LibraryMonitorRuntimeFindMoveJob* _tmp8_; - GError* _tmp9_; - const gchar* _tmp10_; + LibraryMonitorRuntimeFindMoveJob* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = job; + _tmp3_ = job; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _tmp4_->file; + _tmp4_ = _tmp3_->file; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp5_ = g_file_get_path (_tmp4_); #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = job; + _tmp7_ = job; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _tmp8_->err; + _tmp8_ = _tmp7_->err; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_->message; + _tmp9_ = _tmp8_->message; #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_critical ("LibraryMonitor.vala:880: Error attempting to find a match at runtime f" \ -"or %s: %s", _tmp7_, _tmp10_); +"or %s: %s", _tmp6_, _tmp9_); #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp7_); -#line 6622 "LibraryMonitor.c" + _g_free0 (_tmp6_); +#line 6779 "LibraryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = job; + _tmp10_ = job; #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_->match; + _tmp11_ = _tmp10_->match; #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp12_ != NULL) { -#line 6630 "LibraryMonitor.c" + if (_tmp11_ != NULL) { +#line 6787 "LibraryMonitor.c" MediaMonitor* monitor = NULL; - LibraryMonitorRuntimeFindMoveJob* _tmp13_; - Monitorable* _tmp14_; + LibraryMonitorRuntimeFindMoveJob* _tmp12_; + Monitorable* _tmp13_; + MediaMonitor* _tmp14_; MediaMonitor* _tmp15_; - MediaMonitor* _tmp16_; - LibraryMonitorRuntimeFindMoveJob* _tmp17_; - Monitorable* _tmp18_; - LibraryMonitorRuntimeFindMoveJob* _tmp19_; - GFile* _tmp20_; - MediaMonitor* _tmp21_; - LibraryMonitorRuntimeFindMoveJob* _tmp22_; - Monitorable* _tmp23_; + LibraryMonitorRuntimeFindMoveJob* _tmp16_; + Monitorable* _tmp17_; + LibraryMonitorRuntimeFindMoveJob* _tmp18_; + GFile* _tmp19_; + MediaMonitor* _tmp20_; + LibraryMonitorRuntimeFindMoveJob* _tmp21_; + Monitorable* _tmp22_; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = job; + _tmp12_ = job; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _tmp13_->match; + _tmp13_ = _tmp12_->match; #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = library_monitor_get_monitor_for_monitorable (self, _tmp14_); + _tmp14_ = library_monitor_get_monitor_for_monitorable (self, _tmp13_); #line 885 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = _tmp15_; + monitor = _tmp14_; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = monitor; + _tmp15_ = monitor; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = job; + _tmp16_ = job; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _tmp17_->match; + _tmp17_ = _tmp16_->match; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = job; + _tmp18_ = job; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _tmp19_->file; + _tmp19_ = _tmp18_->file; #line 886 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_master_file (_tmp16_, _tmp18_, _tmp20_); + media_monitor_update_master_file (_tmp15_, _tmp17_, _tmp19_); #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = monitor; + _tmp20_ = monitor; #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = job; + _tmp21_ = job; #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _tmp22_->match; + _tmp22_ = _tmp21_->match; #line 887 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - media_monitor_update_online (_tmp21_, _tmp23_); + media_monitor_update_online (_tmp20_, _tmp22_); #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6673 "LibraryMonitor.c" +#line 6830 "LibraryMonitor.c" } else { - LibraryMonitorRuntimeFindMoveJob* _tmp24_; - GFile* _tmp25_; + LibraryMonitorRuntimeFindMoveJob* _tmp23_; + GFile* _tmp24_; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = job; + _tmp23_ = job; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _tmp24_->file; + _tmp24_ = _tmp23_->file; #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6683 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, _tmp24_); +#line 6840 "LibraryMonitor.c" } #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _background_job_unref0 (job); -#line 6687 "LibraryMonitor.c" +#line 6844 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFile* old_file, GFile* new_file, GFileInfo* new_info) { +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_; - gboolean _tmp2_; gboolean known = FALSE; - gboolean _tmp24_; - GFile* _tmp26_; - GFile* _tmp27_; - GFileInfo* _tmp28_; + gboolean _tmp13_; #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" @@ -6707,436 +6864,354 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil #line 894 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_info)); #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = old_file; -#line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = library_monitor_is_blacklisted (_tmp1_); -#line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp2_) { + if (library_monitor_is_blacklisted (old_file)) { #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp0_ = TRUE; -#line 6717 "LibraryMonitor.c" +#line 6870 "LibraryMonitor.c" } else { - 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 6727 "LibraryMonitor.c" + _tmp0_ = library_monitor_is_blacklisted (new_file); +#line 6874 "LibraryMonitor.c" } #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (_tmp0_) { -#line 6731 "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" - _tmp6_ = new_file; -#line 896 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = new_info; -#line 896 "/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), _tmp5_, _tmp6_, _tmp7_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), old_file, new_file, new_info); #line 898 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6745 "LibraryMonitor.c" +#line 6882 "LibraryMonitor.c" } #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6749 "LibraryMonitor.c" +#line 6886 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp8_; - GeeList* _tmp9_; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _monitor_size = 0; - GeeList* _tmp10_; - gint _tmp11_; - gint _tmp12_; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _monitor_index = 0; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = self->priv->monitors; + _tmp1_ = self->priv->monitors; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp2_ = _g_object_ref0 (_tmp1_); #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp9_; + _monitor_list = _tmp2_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_list; + _tmp3_ = _monitor_list; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _tmp11_; + _tmp5_ = _tmp4_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp12_; + _monitor_size = _tmp5_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6777 "LibraryMonitor.c" - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; +#line 6914 "LibraryMonitor.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; MediaMonitor* monitor = NULL; - GeeList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; - MediaMonitor* _tmp19_; - GFile* _tmp20_; - GFile* _tmp21_; - GFileInfo* _tmp22_; - gboolean _tmp23_; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + MediaMonitor* _tmp12_; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _monitor_index; + _tmp6_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp13_ + 1; + _monitor_index = _tmp6_ + 1; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _monitor_index; + _tmp7_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _monitor_size; + _tmp8_ = _monitor_size; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp7_ < _tmp8_)) { #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6802 "LibraryMonitor.c" +#line 6935 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = _monitor_list; + _tmp9_ = _monitor_list; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = _monitor_index; + _tmp10_ = _monitor_index; #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = gee_list_get (_tmp16_, _tmp17_); + _tmp11_ = gee_list_get (_tmp9_, _tmp10_); #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp18_; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = monitor; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = old_file; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = new_file; -#line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = new_info; + monitor = (MediaMonitor*) _tmp11_; #line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = media_monitor_notify_file_moved (_tmp19_, _tmp20_, _tmp21_, _tmp22_); + _tmp12_ = monitor; #line 903 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp23_) { + if (media_monitor_notify_file_moved (_tmp12_, old_file, new_file, new_info)) { #line 904 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6830 "LibraryMonitor.c" +#line 6955 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6834 "LibraryMonitor.c" +#line 6959 "LibraryMonitor.c" } #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6838 "LibraryMonitor.c" +#line 6963 "LibraryMonitor.c" } #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = known; + _tmp13_ = known; #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp24_) { -#line 6844 "LibraryMonitor.c" - GFile* _tmp25_; -#line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = new_file; + if (!_tmp13_) { #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp25_); -#line 6850 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, new_file); +#line 6971 "LibraryMonitor.c" } #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = old_file; -#line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = new_file; -#line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 6860 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), old_file, new_file, new_info); +#line 6975 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GFile* file) { +static void +library_monitor_real_notify_file_altered (DirectoryMonitor* base, + GFile* file) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_; - GFile* _tmp19_; + gboolean _tmp12_; #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" g_return_if_fail (G_IS_FILE (file)); #line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 6881 "LibraryMonitor.c" - GFile* _tmp2_; -#line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (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_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); #line 920 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 6889 "LibraryMonitor.c" +#line 6996 "LibraryMonitor.c" } #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 6893 "LibraryMonitor.c" +#line 7000 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_; - GeeList* _tmp4_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp4_; + _monitor_list = _tmp1_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _monitor_list; + _tmp2_ = _monitor_list; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp7_; + _monitor_size = _tmp4_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 6921 "LibraryMonitor.c" - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; +#line 7028 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - MediaMonitor* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _monitor_index; + _tmp5_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp8_ + 1; + _monitor_index = _tmp5_ + 1; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp6_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_size; + _tmp7_ = _monitor_size; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp9_ < _tmp10_)) { + if (!(_tmp6_ < _tmp7_)) { #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6944 "LibraryMonitor.c" +#line 7049 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_list; + _tmp8_ = _monitor_list; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_index; + _tmp9_ = _monitor_index; #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_list_get (_tmp11_, _tmp12_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp13_; -#line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitor; -#line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = file; + monitor = (MediaMonitor*) _tmp10_; #line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = media_monitor_notify_file_altered (_tmp14_, _tmp15_); + _tmp11_ = monitor; #line 925 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (media_monitor_notify_file_altered (_tmp11_, file)) { #line 926 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 6968 "LibraryMonitor.c" +#line 7069 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 6972 "LibraryMonitor.c" +#line 7073 "LibraryMonitor.c" } #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 6976 "LibraryMonitor.c" +#line 7077 "LibraryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = known; + _tmp12_ = known; #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp17_) { -#line 6982 "LibraryMonitor.c" - GFile* _tmp18_; -#line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = file; + if (!_tmp12_) { #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 6988 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 7085 "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 6994 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); +#line 7089 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, GFile* file) { +static void +library_monitor_real_notify_file_attributes_altered (DirectoryMonitor* base, + GFile* file) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_; - GFile* _tmp19_; + gboolean _tmp12_; #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" g_return_if_fail (G_IS_FILE (file)); #line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 7015 "LibraryMonitor.c" - GFile* _tmp2_; -#line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (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_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); #line 942 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7023 "LibraryMonitor.c" +#line 7110 "LibraryMonitor.c" } #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7027 "LibraryMonitor.c" +#line 7114 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_; - GeeList* _tmp4_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp4_; + _monitor_list = _tmp1_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _monitor_list; + _tmp2_ = _monitor_list; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp7_; + _monitor_size = _tmp4_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7055 "LibraryMonitor.c" - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; +#line 7142 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - MediaMonitor* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _monitor_index; + _tmp5_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp8_ + 1; + _monitor_index = _tmp5_ + 1; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp6_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_size; + _tmp7_ = _monitor_size; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp9_ < _tmp10_)) { + if (!(_tmp6_ < _tmp7_)) { #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7078 "LibraryMonitor.c" +#line 7163 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_list; + _tmp8_ = _monitor_list; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_index; + _tmp9_ = _monitor_index; #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_list_get (_tmp11_, _tmp12_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp13_; -#line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitor; -#line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = file; + monitor = (MediaMonitor*) _tmp10_; #line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = media_monitor_notify_file_attributes_altered (_tmp14_, _tmp15_); + _tmp11_ = monitor; #line 947 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (media_monitor_notify_file_attributes_altered (_tmp11_, file)) { #line 948 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7102 "LibraryMonitor.c" +#line 7183 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7106 "LibraryMonitor.c" +#line 7187 "LibraryMonitor.c" } #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7110 "LibraryMonitor.c" +#line 7191 "LibraryMonitor.c" } #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = known; + _tmp12_ = known; #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp17_) { -#line 7116 "LibraryMonitor.c" - GFile* _tmp18_; -#line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = file; + if (!_tmp12_) { #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp18_); -#line 7122 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 7199 "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 7128 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); +#line 7203 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, GFile* file, GFileInfo* info) { +static void +library_monitor_real_notify_file_alteration_completed (DirectoryMonitor* base, + GFile* file, + GFileInfo* info) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp19_; - GFile* _tmp21_; - GFileInfo* _tmp22_; + gboolean _tmp12_; #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" @@ -7144,314 +7219,268 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni #line 960 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 7152 "LibraryMonitor.c" - GFile* _tmp2_; - GFileInfo* _tmp3_; -#line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (file)) { #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = info; -#line 962 "/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), _tmp2_, _tmp3_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); #line 964 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7163 "LibraryMonitor.c" +#line 7227 "LibraryMonitor.c" } #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7167 "LibraryMonitor.c" +#line 7231 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp4_; - GeeList* _tmp5_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp6_; - gint _tmp7_; - gint _tmp8_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp5_; + _monitor_list = _tmp1_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _monitor_list; + _tmp2_ = _monitor_list; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp8_; + _monitor_size = _tmp4_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7195 "LibraryMonitor.c" - gint _tmp9_; - gint _tmp10_; - gint _tmp11_; +#line 7259 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp12_; - gint _tmp13_; - gpointer _tmp14_; - MediaMonitor* _tmp15_; - GFile* _tmp16_; - GFileInfo* _tmp17_; - gboolean _tmp18_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp5_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp9_ + 1; + _monitor_index = _tmp5_ + 1; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_index; + _tmp6_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_size; + _tmp7_ = _monitor_size; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp10_ < _tmp11_)) { + if (!(_tmp6_ < _tmp7_)) { #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7219 "LibraryMonitor.c" +#line 7280 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_list; + _tmp8_ = _monitor_list; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = _monitor_index; + _tmp9_ = _monitor_index; #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = gee_list_get (_tmp12_, _tmp13_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp14_; -#line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = monitor; -#line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = file; -#line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = info; + monitor = (MediaMonitor*) _tmp10_; #line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = media_monitor_notify_file_alteration_completed (_tmp15_, _tmp16_, _tmp17_); + _tmp11_ = monitor; #line 969 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp18_) { + if (media_monitor_notify_file_alteration_completed (_tmp11_, file, info)) { #line 970 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7245 "LibraryMonitor.c" +#line 7300 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7249 "LibraryMonitor.c" +#line 7304 "LibraryMonitor.c" } #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7253 "LibraryMonitor.c" +#line 7308 "LibraryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = known; + _tmp12_ = known; #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp19_) { -#line 7259 "LibraryMonitor.c" - GFile* _tmp20_; -#line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = file; + if (!_tmp12_) { #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_runtime_unknown_file_discovered (self, _tmp20_); -#line 7265 "LibraryMonitor.c" + library_monitor_runtime_unknown_file_discovered (self, file); +#line 7316 "LibraryMonitor.c" } #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = file; -#line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _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 7273 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file, info); +#line 7320 "LibraryMonitor.c" } -static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GFile* file) { +static void +library_monitor_real_notify_file_deleted (DirectoryMonitor* base, + GFile* file) +{ LibraryMonitor * self; - GFile* _tmp0_; - gboolean _tmp1_; gboolean known = FALSE; - gboolean _tmp17_; - GFile* _tmp28_; + gboolean _tmp12_; #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" g_return_if_fail (G_IS_FILE (file)); #line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = file; -#line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = library_monitor_is_blacklisted (_tmp0_); -#line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp1_) { -#line 7294 "LibraryMonitor.c" - GFile* _tmp2_; -#line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = file; + if (library_monitor_is_blacklisted (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_); + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); #line 986 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7302 "LibraryMonitor.c" +#line 7341 "LibraryMonitor.c" } #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = FALSE; -#line 7306 "LibraryMonitor.c" +#line 7345 "LibraryMonitor.c" { GeeList* _monitor_list = NULL; - GeeList* _tmp3_; - GeeList* _tmp4_; + GeeList* _tmp0_; + GeeList* _tmp1_; gint _monitor_size = 0; - GeeList* _tmp5_; - gint _tmp6_; - gint _tmp7_; + GeeList* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint _monitor_index = 0; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = self->priv->monitors; + _tmp0_ = self->priv->monitors; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_list = _tmp4_; + _monitor_list = _tmp1_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _monitor_list; + _tmp2_ = _monitor_list; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_size = _tmp7_; + _monitor_size = _tmp4_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _monitor_index = -1; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7334 "LibraryMonitor.c" - gint _tmp8_; - gint _tmp9_; - gint _tmp10_; +#line 7373 "LibraryMonitor.c" + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; MediaMonitor* monitor = NULL; - GeeList* _tmp11_; - gint _tmp12_; - gpointer _tmp13_; - MediaMonitor* _tmp14_; - GFile* _tmp15_; - gboolean _tmp16_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + MediaMonitor* _tmp11_; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _monitor_index; + _tmp5_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _monitor_index = _tmp8_ + 1; + _monitor_index = _tmp5_ + 1; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = _monitor_index; + _tmp6_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _monitor_size; + _tmp7_ = _monitor_size; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!(_tmp9_ < _tmp10_)) { + if (!(_tmp6_ < _tmp7_)) { #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7357 "LibraryMonitor.c" +#line 7394 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = _monitor_list; + _tmp8_ = _monitor_list; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = _monitor_index; + _tmp9_ = _monitor_index; #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_list_get (_tmp11_, _tmp12_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - monitor = (MediaMonitor*) _tmp13_; -#line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = monitor; -#line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = file; + monitor = (MediaMonitor*) _tmp10_; #line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = media_monitor_notify_file_deleted (_tmp14_, _tmp15_); + _tmp11_ = monitor; #line 991 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { + if (media_monitor_notify_file_deleted (_tmp11_, file)) { #line 992 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" known = TRUE; #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7381 "LibraryMonitor.c" +#line 7414 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (monitor); -#line 7385 "LibraryMonitor.c" +#line 7418 "LibraryMonitor.c" } #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_monitor_list); -#line 7389 "LibraryMonitor.c" +#line 7422 "LibraryMonitor.c" } #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = known; + _tmp12_ = known; #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp17_) { -#line 7395 "LibraryMonitor.c" + if (!_tmp12_) { +#line 7428 "LibraryMonitor.c" Tombstone* tombstone = NULL; - TombstoneSourceCollection* _tmp18_; - GFile* _tmp19_; - Tombstone* _tmp20_; - Tombstone* _tmp21_; - GFile* _tmp27_; -#line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = tombstone_global; + TombstoneSourceCollection* _tmp13_; + Tombstone* _tmp14_; + Tombstone* _tmp15_; #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = file; + _tmp13_ = tombstone_global; #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = tombstone_source_collection_locate (_tmp18_, _tmp19_); + _tmp14_ = tombstone_source_collection_locate (_tmp13_, file); #line 1000 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone = _tmp20_; + tombstone = _tmp14_; #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = tombstone; + _tmp15_ = tombstone; #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp21_ != NULL) { -#line 7414 "LibraryMonitor.c" - GFile* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - TombstoneSourceCollection* _tmp25_; - Tombstone* _tmp26_; -#line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = file; + if (_tmp15_ != NULL) { +#line 7443 "LibraryMonitor.c" + gchar* _tmp16_; + gchar* _tmp17_; + TombstoneSourceCollection* _tmp18_; + Tombstone* _tmp19_; #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = g_file_get_path (_tmp22_); + _tmp16_ = g_file_get_path (file); #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = _tmp23_; + _tmp17_ = _tmp16_; #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - g_debug ("LibraryMonitor.vala:1002: Resurrecting tombstoned file %s", _tmp24_); + g_debug ("LibraryMonitor.vala:1002: Resurrecting tombstoned file %s", _tmp17_); #line 1002 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp24_); + _g_free0 (_tmp17_); #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = tombstone_global; + _tmp18_ = tombstone_global; #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = tombstone; + _tmp19_ = tombstone; #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - tombstone_source_collection_resurrect (_tmp25_, _tmp26_); -#line 7436 "LibraryMonitor.c" + tombstone_source_collection_resurrect (_tmp18_, _tmp19_); +#line 7462 "LibraryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = file; -#line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - library_monitor_remove_queued_import (self, _tmp27_); + library_monitor_remove_queued_import (self, file); #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (tombstone); -#line 7444 "LibraryMonitor.c" +#line 7468 "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 7450 "LibraryMonitor.c" + DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), file); +#line 7472 "LibraryMonitor.c" } -static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2); register GMarshalFunc_VOID__INT_INT callback; register GCClosure * cc; @@ -7466,23 +7495,30 @@ 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 7469 "LibraryMonitor.c" +#line 7498 "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 7475 "LibraryMonitor.c" +#line 7504 "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 7481 "LibraryMonitor.c" +#line 7510 "LibraryMonitor.c" } -static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { +static void +g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, + GValue * return_value, + guint n_param_values, + const GValue * param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ typedef void (*GMarshalFunc_VOID__UINT64_UINT64) (gpointer data1, guint64 arg_1, guint64 arg_2, gpointer data2); register GMarshalFunc_VOID__UINT64_UINT64 callback; register GCClosure * cc; @@ -7497,47 +7533,52 @@ 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 7500 "LibraryMonitor.c" +#line 7536 "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 7506 "LibraryMonitor.c" +#line 7542 "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 7512 "LibraryMonitor.c" +#line 7548 "LibraryMonitor.c" } -static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) { +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 7519 "LibraryMonitor.c" +#line 7558 "LibraryMonitor.c" } -static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) { +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 7526 "LibraryMonitor.c" +#line 7568 "LibraryMonitor.c" } -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +static LibraryMonitorFindMoveJob* +library_monitor_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates) +{ LibraryMonitorFindMoveJob* self = NULL; - LibraryMonitor* _tmp0_; - LibraryMonitor* _tmp1_; - LibraryMonitor* _tmp2_; - GCancellable* _tmp3_; - LibraryMonitor* _tmp4_; - GFile* _tmp5_; - GFile* _tmp6_; - GeeCollection* _tmp7_; - GeeCollection* _tmp8_; + GCancellable* _tmp0_; + GFile* _tmp1_; + GeeCollection* _tmp2_; #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" @@ -7545,63 +7586,59 @@ static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (GEE_IS_COLLECTION (candidates), NULL); #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = owner; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = owner; + _tmp0_ = owner->priv->cancellable; #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = owner; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->priv->cancellable; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = owner; -#line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self = (LibraryMonitorFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _library_monitor_on_find_move_completed_completion_callback, _tmp1_, _tmp3_, _library_monitor_on_find_move_cancelled_cancellation_callback, _tmp4_, NULL); + self = (LibraryMonitorFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _library_monitor_on_find_move_completed_completion_callback, owner, _tmp0_, _library_monitor_on_find_move_cancelled_cancellation_callback, owner, NULL); #line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = file; -#line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp1_ = _g_object_ref0 (file); #line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->file); #line 113 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->file = _tmp6_; -#line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = candidates; + self->file = _tmp1_; #line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp2_ = _g_object_ref0 (candidates); #line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->candidates); #line 114 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->candidates = _tmp8_; + self->candidates = _tmp2_; #line 116 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 7579 "LibraryMonitor.c" +#line 7608 "LibraryMonitor.c" } -static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +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 7586 "LibraryMonitor.c" +#line 7619 "LibraryMonitor.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7593 "LibraryMonitor.c" +#line 7628 "LibraryMonitor.c" } -static void library_monitor_find_move_job_real_execute (BackgroundJob* base) { +static void +library_monitor_find_move_job_real_execute (BackgroundJob* base) +{ LibraryMonitorFindMoveJob * self; GeeIterator* iter = NULL; GeeCollection* _tmp0_; GeeIterator* _tmp1_; - GeeCollection* _tmp12_; - gint _tmp13_; - gint _tmp14_; + GeeCollection* _tmp10_; + gint _tmp11_; + gint _tmp12_; gchar* md5 = NULL; GError * _inner_error_ = NULL; #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7614,118 +7651,112 @@ 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 7617 "LibraryMonitor.c" +#line 7654 "LibraryMonitor.c" GeeIterator* _tmp2_; - gboolean _tmp3_; - GeeIterator* _tmp4_; - gpointer _tmp5_; - Monitorable* _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + Monitorable* _tmp5_; + GFile* _tmp6_; GFile* _tmp7_; - GFile* _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + gboolean _tmp8_; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp2_ = iter; #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp2_)) { #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7635 "LibraryMonitor.c" +#line 7668 "LibraryMonitor.c" } #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = iter; -#line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = iter; #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = (Monitorable*) _tmp5_; + _tmp4_ = gee_iterator_get (_tmp3_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp5_ = (Monitorable*) _tmp4_; #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp8_ = _tmp7_; + _tmp6_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = g_file_query_exists (_tmp8_, NULL); + _tmp7_ = _tmp6_; #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _tmp9_; + _tmp8_ = g_file_query_exists (_tmp7_, NULL); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp10_) { -#line 7657 "LibraryMonitor.c" - GeeIterator* _tmp11_; + if (_tmp8_) { +#line 7688 "LibraryMonitor.c" + GeeIterator* _tmp9_; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = iter; + _tmp9_ = iter; #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_iterator_remove (_tmp11_); -#line 7663 "LibraryMonitor.c" + gee_iterator_remove (_tmp9_); +#line 7694 "LibraryMonitor.c" } } #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = self->candidates; + _tmp10_ = self->candidates; #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = gee_collection_get_size (_tmp12_); + _tmp11_ = gee_collection_get_size (_tmp10_); #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp14_ == 0) { + if (_tmp12_ == 0) { #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (iter); #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return; -#line 7678 "LibraryMonitor.c" +#line 7709 "LibraryMonitor.c" } #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" md5 = NULL; -#line 7682 "LibraryMonitor.c" +#line 7713 "LibraryMonitor.c" { - gchar* _tmp15_ = NULL; - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; + gchar* _tmp13_ = NULL; + GFile* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = self->file; + _tmp14_ = self->file; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = md5_file (_tmp16_, &_inner_error_); + _tmp15_ = md5_file (_tmp14_, &_inner_error_); #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = _tmp17_; + _tmp13_ = _tmp15_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7696 "LibraryMonitor.c" +#line 7727 "LibraryMonitor.c" goto __catch501_g_error; } #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _tmp15_; + _tmp16_ = _tmp13_; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = NULL; + _tmp13_ = NULL; #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - md5 = _tmp18_; + md5 = _tmp16_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp15_); -#line 7709 "LibraryMonitor.c" + _g_free0 (_tmp13_); +#line 7740 "LibraryMonitor.c" } goto __finally501; __catch501_g_error: { GError* err = NULL; - GError* _tmp19_; - GError* _tmp20_; + GError* _tmp17_; + GError* _tmp18_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" err = _inner_error_; #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp19_ = err; + _tmp17_ = err; #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp20_ = _g_error_copy0 (_tmp19_); + _tmp18_ = _g_error_copy0 (_tmp17_); #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (self->err); #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->err = _tmp20_; + self->err = _tmp18_; #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_error_free0 (err); #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7734,7 +7765,7 @@ 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 7737 "LibraryMonitor.c" +#line 7768 "LibraryMonitor.c" } __finally501: #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -7749,187 +7780,190 @@ 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 7752 "LibraryMonitor.c" +#line 7783 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; - GeeCollection* _tmp21_; - GeeIterator* _tmp22_; + GeeCollection* _tmp19_; + GeeIterator* _tmp20_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp21_ = self->candidates; + _tmp19_ = self->candidates; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _candidate_it = _tmp22_; + _candidate_it = _tmp20_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" while (TRUE) { -#line 7766 "LibraryMonitor.c" - GeeIterator* _tmp23_; - gboolean _tmp24_; +#line 7797 "LibraryMonitor.c" + GeeIterator* _tmp21_; Monitorable* candidate = NULL; - GeeIterator* _tmp25_; - gpointer _tmp26_; - Monitorable* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; - Monitorable* _tmp32_; - Monitorable* _tmp46_; - Monitorable* _tmp47_; + GeeIterator* _tmp22_; + gpointer _tmp23_; + Monitorable* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + const gchar* _tmp27_; + gboolean _tmp28_; + Monitorable* _tmp29_; + Monitorable* _tmp43_; + Monitorable* _tmp44_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp23_ = _candidate_it; + _tmp21_ = _candidate_it; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp24_ = gee_iterator_next (_tmp23_); -#line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp24_) { + if (!gee_iterator_next (_tmp21_)) { #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 7788 "LibraryMonitor.c" +#line 7816 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp25_ = _candidate_it; + _tmp22_ = _candidate_it; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp26_ = gee_iterator_get (_tmp25_); + _tmp23_ = gee_iterator_get (_tmp22_); #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidate = (Monitorable*) _tmp26_; + candidate = (Monitorable*) _tmp23_; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp27_ = candidate; + _tmp24_ = candidate; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp28_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp25_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource)); #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = _tmp28_; + _tmp26_ = _tmp25_; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp30_ = md5; + _tmp27_ = md5; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp31_ = g_strcmp0 (_tmp29_, _tmp30_) != 0; + _tmp28_ = g_strcmp0 (_tmp26_, _tmp27_) != 0; #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp26_); #line 141 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp31_) { + if (_tmp28_) { #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 7814 "LibraryMonitor.c" +#line 7842 "LibraryMonitor.c" } #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp32_ = self->match; + _tmp29_ = self->match; #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp32_ != NULL) { -#line 7820 "LibraryMonitor.c" - GFile* _tmp33_; + if (_tmp29_ != NULL) { +#line 7848 "LibraryMonitor.c" + GFile* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + Monitorable* _tmp33_; gchar* _tmp34_; gchar* _tmp35_; Monitorable* _tmp36_; gchar* _tmp37_; gchar* _tmp38_; - Monitorable* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - GeeArrayList* _tmp42_; - GeeArrayList* _tmp44_; - Monitorable* _tmp45_; + GeeArrayList* _tmp39_; + GeeArrayList* _tmp41_; + Monitorable* _tmp42_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp33_ = self->file; + _tmp30_ = self->file; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp34_ = g_file_get_path (_tmp33_); + _tmp31_ = g_file_get_path (_tmp30_); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp36_ = self->match; + _tmp33_ = self->match; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp37_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject)); + _tmp34_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp38_ = _tmp37_; + _tmp35_ = _tmp34_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = candidate; + _tmp36_ = candidate; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp40_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject)); + _tmp37_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject)); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp41_ = _tmp40_; + _tmp38_ = _tmp37_; #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_warning ("LibraryMonitor.vala:145: Found more than one media match for %s: %s an" \ -"d %s", _tmp35_, _tmp38_, _tmp41_); -#line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp41_); +"d %s", _tmp32_, _tmp35_, _tmp38_); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp38_); #line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (_tmp35_); +#line 145 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" + _g_free0 (_tmp32_); #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp42_ = self->losers; + _tmp39_ = self->losers; #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp42_ == NULL) { -#line 7863 "LibraryMonitor.c" - GeeArrayList* _tmp43_; + if (_tmp39_ == NULL) { +#line 7891 "LibraryMonitor.c" + GeeArrayList* _tmp40_; #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); + _tmp40_ = 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 7871 "LibraryMonitor.c" + self->losers = _tmp40_; +#line 7899 "LibraryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp44_ = self->losers; + _tmp41_ = self->losers; #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp45_ = candidate; + _tmp42_ = candidate; #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp45_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp42_); #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" continue; -#line 7883 "LibraryMonitor.c" +#line 7911 "LibraryMonitor.c" } #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp46_ = candidate; + _tmp43_ = candidate; #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp47_ = _g_object_ref0 (_tmp46_); + _tmp44_ = _g_object_ref0 (_tmp43_); #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->match); #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->match = _tmp47_; + self->match = _tmp44_; #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 7895 "LibraryMonitor.c" +#line 7923 "LibraryMonitor.c" } #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 7899 "LibraryMonitor.c" +#line 7927 "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 7905 "LibraryMonitor.c" +#line 7933 "LibraryMonitor.c" } -static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobClass * klass) { +static void +library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobClass * klass) +{ #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_find_move_job_parent_class = g_type_class_peek_parent (klass); #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 7916 "LibraryMonitor.c" +#line 7946 "LibraryMonitor.c" } -static void library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJob * self) { +static void +library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJob * self) +{ #line 106 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->match = NULL; #line 107 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->losers = NULL; #line 108 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 7927 "LibraryMonitor.c" +#line 7959 "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); @@ -7945,11 +7979,13 @@ 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 7947 "LibraryMonitor.c" +#line 7981 "LibraryMonitor.c" } -static GType library_monitor_find_move_job_get_type (void) { +static GType +library_monitor_find_move_job_get_type (void) +{ static volatile gsize library_monitor_find_move_job_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_find_move_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMonitorFindMoveJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_monitor_find_move_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMonitorFindMoveJob), 0, (GInstanceInitFunc) library_monitor_find_move_job_instance_init, NULL }; @@ -7961,23 +7997,26 @@ 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) { +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 7966 "LibraryMonitor.c" +#line 8005 "LibraryMonitor.c" } -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_construct (GType object_type, LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +static LibraryMonitorRuntimeFindMoveJob* +library_monitor_runtime_find_move_job_construct (GType object_type, + LibraryMonitor* owner, + GFile* file, + GeeCollection* candidates) +{ LibraryMonitorRuntimeFindMoveJob* self = NULL; - LibraryMonitor* _tmp0_; - LibraryMonitor* _tmp1_; - LibraryMonitor* _tmp2_; - GCancellable* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; - GeeCollection* _tmp6_; - GeeCollection* _tmp7_; + GCancellable* _tmp0_; + GFile* _tmp1_; + GeeCollection* _tmp2_; #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" @@ -7985,47 +8024,43 @@ static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_c #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (GEE_IS_COLLECTION (candidates), NULL); #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = owner; -#line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = owner; -#line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = owner; + _tmp0_ = owner->priv->cancellable; #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _tmp2_->priv->cancellable; -#line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self = (LibraryMonitorRuntimeFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _library_monitor_on_runtime_find_move_completed_completion_callback, _tmp1_, _tmp3_, NULL, NULL, NULL); -#line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = file; + self = (LibraryMonitorRuntimeFindMoveJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), _library_monitor_on_runtime_find_move_completed_completion_callback, owner, _tmp0_, NULL, NULL, NULL); #line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp1_ = _g_object_ref0 (file); #line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->file); #line 170 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->file = _tmp5_; -#line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = candidates; + self->file = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = _g_object_ref0 (_tmp6_); + _tmp2_ = _g_object_ref0 (candidates); #line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->candidates); #line 171 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->candidates = _tmp7_; + self->candidates = _tmp2_; #line 173 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 8016 "LibraryMonitor.c" +#line 8045 "LibraryMonitor.c" } -static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) { +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 8023 "LibraryMonitor.c" +#line 8056 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base) { +static void +library_monitor_runtime_find_move_job_real_execute (BackgroundJob* base) +{ LibraryMonitorRuntimeFindMoveJob * self; gchar* md5 = NULL; GError * _inner_error_ = NULL; @@ -8033,7 +8068,7 @@ 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 8035 "LibraryMonitor.c" +#line 8070 "LibraryMonitor.c" { gchar* _tmp0_ = NULL; GFile* _tmp1_; @@ -8047,7 +8082,7 @@ 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 8049 "LibraryMonitor.c" +#line 8084 "LibraryMonitor.c" goto __catch502_g_error; } #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8060,7 +8095,7 @@ 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 8062 "LibraryMonitor.c" +#line 8097 "LibraryMonitor.c" } goto __finally502; __catch502_g_error: @@ -8086,7 +8121,7 @@ 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 8088 "LibraryMonitor.c" +#line 8123 "LibraryMonitor.c" } __finally502: #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8099,7 +8134,7 @@ 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 8101 "LibraryMonitor.c" +#line 8136 "LibraryMonitor.c" } { GeeIterator* _candidate_it = NULL; @@ -8113,99 +8148,102 @@ 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 8115 "LibraryMonitor.c" +#line 8150 "LibraryMonitor.c" GeeIterator* _tmp8_; - gboolean _tmp9_; Monitorable* candidate = NULL; - GeeIterator* _tmp10_; - gpointer _tmp11_; - Monitorable* _tmp12_; + GeeIterator* _tmp9_; + gpointer _tmp10_; + Monitorable* _tmp11_; + gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; - gboolean _tmp16_; + const gchar* _tmp14_; + gboolean _tmp15_; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _tmp8_ = _candidate_it; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (!_tmp9_) { + if (!gee_iterator_next (_tmp8_)) { #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8134 "LibraryMonitor.c" +#line 8166 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp10_ = _candidate_it; + _tmp9_ = _candidate_it; #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp11_ = gee_iterator_get (_tmp10_); + _tmp10_ = gee_iterator_get (_tmp9_); #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - candidate = (Monitorable*) _tmp11_; + candidate = (Monitorable*) _tmp10_; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp12_ = candidate; + _tmp11_ = candidate; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp13_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp12_ = media_source_get_master_md5 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)); #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp15_ = md5; + _tmp14_ = md5; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp16_ = g_strcmp0 (_tmp14_, _tmp15_) == 0; + _tmp15_ = g_strcmp0 (_tmp13_, _tmp14_) == 0; #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp13_); #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - if (_tmp16_) { -#line 8156 "LibraryMonitor.c" + if (_tmp15_) { +#line 8188 "LibraryMonitor.c" + Monitorable* _tmp16_; Monitorable* _tmp17_; - Monitorable* _tmp18_; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp17_ = candidate; + _tmp16_ = candidate; #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp18_ = _g_object_ref0 (_tmp17_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->match); #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->match = _tmp18_; + self->match = _tmp17_; #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" break; -#line 8171 "LibraryMonitor.c" +#line 8203 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (candidate); -#line 8175 "LibraryMonitor.c" +#line 8207 "LibraryMonitor.c" } #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (_candidate_it); -#line 8179 "LibraryMonitor.c" +#line 8211 "LibraryMonitor.c" } #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_free0 (md5); -#line 8183 "LibraryMonitor.c" +#line 8215 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRuntimeFindMoveJobClass * klass) { +static void +library_monitor_runtime_find_move_job_class_init (LibraryMonitorRuntimeFindMoveJobClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_runtime_find_move_job_parent_class = g_type_class_peek_parent (klass); #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 8194 "LibraryMonitor.c" +#line 8228 "LibraryMonitor.c" } -static void library_monitor_runtime_find_move_job_instance_init (LibraryMonitorRuntimeFindMoveJob * self) { +static void +library_monitor_runtime_find_move_job_instance_init (LibraryMonitorRuntimeFindMoveJob * self) +{ #line 164 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->match = NULL; #line 165 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->err = NULL; -#line 8203 "LibraryMonitor.c" +#line 8239 "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); @@ -8219,11 +8257,13 @@ 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 8221 "LibraryMonitor.c" +#line 8259 "LibraryMonitor.c" } -static GType library_monitor_runtime_find_move_job_get_type (void) { +static GType +library_monitor_runtime_find_move_job_get_type (void) +{ static volatile gsize library_monitor_runtime_find_move_job_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_runtime_find_move_job_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMonitorRuntimeFindMoveJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_monitor_runtime_find_move_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMonitorRuntimeFindMoveJob), 0, (GInstanceInitFunc) library_monitor_runtime_find_move_job_instance_init, NULL }; @@ -8235,12 +8275,14 @@ 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) { +static LibraryMonitorVerifyJob* +library_monitor_verify_job_construct (GType object_type, + Monitorable* monitorable, + MediaMonitor* monitor) +{ LibraryMonitorVerifyJob* self = NULL; Monitorable* _tmp0_; - Monitorable* _tmp1_; - MediaMonitor* _tmp2_; - MediaMonitor* _tmp3_; + MediaMonitor* _tmp1_; #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" @@ -8248,132 +8290,156 @@ static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType obje #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self = (LibraryMonitorVerifyJob*) g_type_create_instance (object_type); #line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = monitorable; -#line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (monitorable); #line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitorable); #line 201 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->monitorable = _tmp1_; -#line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = monitor; + self->monitorable = _tmp0_; #line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = _g_object_ref0 (monitor); #line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _g_object_unref0 (self->monitor); #line 202 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->monitor = _tmp3_; + self->monitor = _tmp1_; #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return self; -#line 8267 "LibraryMonitor.c" +#line 8305 "LibraryMonitor.c" } -static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor) { +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 8274 "LibraryMonitor.c" +#line 8315 "LibraryMonitor.c" } -static void library_monitor_value_verify_job_init (GValue* value) { +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 8281 "LibraryMonitor.c" +#line 8324 "LibraryMonitor.c" } -static void library_monitor_value_verify_job_free_value (GValue* value) { +static void +library_monitor_value_verify_job_free_value (GValue* value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 8290 "LibraryMonitor.c" +#line 8335 "LibraryMonitor.c" } } -static void library_monitor_value_verify_job_copy_value (const GValue* src_value, GValue* dest_value) { +static void +library_monitor_value_verify_job_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 8300 "LibraryMonitor.c" +#line 8348 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 8304 "LibraryMonitor.c" +#line 8352 "LibraryMonitor.c" } } -static gpointer library_monitor_value_verify_job_peek_pointer (const GValue* 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 8312 "LibraryMonitor.c" +#line 8362 "LibraryMonitor.c" } -static gchar* library_monitor_value_verify_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 8319 "LibraryMonitor.c" +#line 8374 "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 8326 "LibraryMonitor.c" +#line 8381 "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 8330 "LibraryMonitor.c" +#line 8385 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = library_monitor_verify_job_ref (object); -#line 8334 "LibraryMonitor.c" +#line 8389 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8338 "LibraryMonitor.c" +#line 8393 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8342 "LibraryMonitor.c" +#line 8397 "LibraryMonitor.c" } -static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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; 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 8353 "LibraryMonitor.c" +#line 8413 "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 8359 "LibraryMonitor.c" +#line 8419 "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 8363 "LibraryMonitor.c" +#line 8423 "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 8367 "LibraryMonitor.c" +#line 8427 "LibraryMonitor.c" } #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" return NULL; -#line 8371 "LibraryMonitor.c" +#line 8431 "LibraryMonitor.c" } -static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +library_monitor_param_spec_verify_job (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ LibraryMonitorParamSpecVerifyJob* spec; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_return_val_if_fail (g_type_is_a (object_type, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL); @@ -8383,20 +8449,25 @@ 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 8385 "LibraryMonitor.c" +#line 8451 "LibraryMonitor.c" } -static gpointer library_monitor_value_get_verify_job (const GValue* value) { +static gpointer +library_monitor_value_get_verify_job (const GValue* value) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 8394 "LibraryMonitor.c" +#line 8462 "LibraryMonitor.c" } -static void library_monitor_value_set_verify_job (GValue* value, gpointer v_object) { +static void +library_monitor_value_set_verify_job (GValue* value, + gpointer v_object) +{ 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)); @@ -8412,22 +8483,25 @@ 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 8414 "LibraryMonitor.c" +#line 8485 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8418 "LibraryMonitor.c" +#line 8489 "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 8424 "LibraryMonitor.c" +#line 8495 "LibraryMonitor.c" } } -static void library_monitor_value_take_verify_job (GValue* value, gpointer v_object) { +static void +library_monitor_value_take_verify_job (GValue* value, + gpointer v_object) +{ 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)); @@ -8441,38 +8515,44 @@ 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 8443 "LibraryMonitor.c" +#line 8517 "LibraryMonitor.c" } else { #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" value->data[0].v_pointer = NULL; -#line 8447 "LibraryMonitor.c" +#line 8521 "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 8453 "LibraryMonitor.c" +#line 8527 "LibraryMonitor.c" } } -static void library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass * klass) { +static void +library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass * klass) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" 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 8463 "LibraryMonitor.c" +#line 8539 "LibraryMonitor.c" } -static void library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) { +static void +library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) +{ #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->ref_count = 1; -#line 8470 "LibraryMonitor.c" +#line 8548 "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); @@ -8482,11 +8562,13 @@ 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 8484 "LibraryMonitor.c" +#line 8564 "LibraryMonitor.c" } -static GType library_monitor_verify_job_get_type (void) { +static GType +library_monitor_verify_job_get_type (void) +{ static volatile gsize library_monitor_verify_job_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_verify_job_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { library_monitor_value_verify_job_init, library_monitor_value_verify_job_free_value, library_monitor_value_verify_job_copy_value, library_monitor_value_verify_job_peek_pointer, "p", library_monitor_value_verify_job_collect_value, "p", library_monitor_value_verify_job_lcopy_value }; @@ -8500,18 +8582,22 @@ static GType library_monitor_verify_job_get_type (void) { } -static gpointer library_monitor_verify_job_ref (gpointer instance) { +static gpointer +library_monitor_verify_job_ref (gpointer instance) +{ 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 8509 "LibraryMonitor.c" +#line 8593 "LibraryMonitor.c" } -static void library_monitor_verify_job_unref (gpointer instance) { +static void +library_monitor_verify_job_unref (gpointer instance) +{ LibraryMonitorVerifyJob * self; self = instance; #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8520,12 +8606,14 @@ 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 8522 "LibraryMonitor.c" +#line 8608 "LibraryMonitor.c" } } -static void library_monitor_class_init (LibraryMonitorClass * klass) { +static void +library_monitor_class_init (LibraryMonitorClass * klass) +{ GeeHashSet* _tmp0_; HashTimedQueue* _tmp1_; #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8570,53 +8658,52 @@ 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 8572 "LibraryMonitor.c" +#line 8660 "LibraryMonitor.c" } -static void library_monitor_instance_init (LibraryMonitor * self) { - guint _tmp0_; - Workers* _tmp1_; - GCancellable* _tmp2_; - GeeArrayList* _tmp3_; +static void +library_monitor_instance_init (LibraryMonitor * self) +{ + Workers* _tmp0_; + GCancellable* _tmp1_; + GeeArrayList* _tmp2_; + GeeHashSet* _tmp3_; GeeHashSet* _tmp4_; - GeeHashSet* _tmp5_; - GeeArrayList* _tmp6_; - GeeLinkedList* _tmp7_; + GeeArrayList* _tmp5_; + GeeLinkedList* _tmp6_; #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" - _tmp0_ = workers_thread_per_cpu_minus_one (); + _tmp0_ = workers_new (workers_thread_per_cpu_minus_one (), FALSE); #line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = workers_new (_tmp0_, FALSE); -#line 210 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->workers = _tmp1_; + self->priv->workers = _tmp0_; #line 211 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp2_ = g_cancellable_new (); + _tmp1_ = g_cancellable_new (); #line 211 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->cancellable = _tmp2_; + self->priv->cancellable = _tmp1_; #line 212 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->auto_import = FALSE; #line 213 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->unknown_files = NULL; #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp3_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->monitors = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList); + self->priv->monitors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList); #line 215 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->discovered = NULL; #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp3_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->import_queue = _tmp4_; + self->priv->import_queue = _tmp3_; #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->pending_imports = _tmp5_; + self->priv->pending_imports = _tmp4_; #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->batch_import_queue = _tmp6_; + self->priv->batch_import_queue = _tmp5_; #line 219 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->current_import_roll = NULL; #line 220 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" @@ -8630,20 +8717,22 @@ static void library_monitor_instance_init (LibraryMonitor * self) { #line 224 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->import_queue_timer_id = (guint) 0; #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp7_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, (GDestroyNotify) library_monitor_verify_job_unref, NULL, NULL, NULL); + _tmp6_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, (GDestroyNotify) library_monitor_verify_job_unref, NULL, NULL, NULL); #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - self->priv->verify_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_QUEUE, GeeQueue); + self->priv->verify_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_QUEUE, GeeQueue); #line 226 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->outstanding_verify_jobs = 0; #line 227 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->completed_monitorable_verifies = 0; #line 228 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->total_monitorable_verifies = 0; -#line 8641 "LibraryMonitor.c" +#line 8728 "LibraryMonitor.c" } -static void library_monitor_finalize (GObject * obj) { +static void +library_monitor_finalize (GObject * obj) +{ LibraryMonitor * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; @@ -8684,11 +8773,13 @@ 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 8686 "LibraryMonitor.c" +#line 8775 "LibraryMonitor.c" } -GType library_monitor_get_type (void) { +GType +library_monitor_get_type (void) +{ static volatile gsize library_monitor_type_id__volatile = 0; if (g_once_init_enter (&library_monitor_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LibraryMonitorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_monitor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMonitor), 0, (GInstanceInitFunc) library_monitor_instance_init, NULL }; @@ -8700,7 +8791,11 @@ GType library_monitor_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -8712,7 +8807,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3