diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
| commit | e230b6f78546827521107be23797048482c8b193 (patch) | |
| tree | 948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/LibraryMonitor.c | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | 49120f48474fc8fdc2448c75d961bc238213cfac (diff) | |
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/LibraryMonitor.c')
| -rw-r--r-- | src/LibraryMonitor.c | 1145 |
1 files changed, 573 insertions, 572 deletions
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" } |