diff options
Diffstat (limited to 'src/DirectoryMonitor.c')
| -rw-r--r-- | src/DirectoryMonitor.c | 4316 |
1 files changed, 1965 insertions, 2351 deletions
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c index 045e3ec..f673b36 100644 --- a/src/DirectoryMonitor.c +++ b/src/DirectoryMonitor.c @@ -1,4 +1,4 @@ -/* DirectoryMonitor.c generated by valac 0.34.7, the Vala compiler +/* DirectoryMonitor.c generated by valac 0.36.6, the Vala compiler * generated from DirectoryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -115,6 +115,30 @@ typedef struct _DirectoryMonitorQueryInfoQueueElementPrivate DirectoryMonitorQue typedef struct _DirectoryMonitorParamSpecQueryInfoQueueElement DirectoryMonitorParamSpecQueryInfoQueueElement; typedef struct _DirectoryMonitorFileInfoMapPrivate DirectoryMonitorFileInfoMapPrivate; typedef struct _DirectoryMonitorParamSpecFileInfoMap DirectoryMonitorParamSpecFileInfoMap; +enum { + DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL, + DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL, + DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL, + DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL, + DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL, + DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL, + DIRECTORY_MONITOR_FILE_CREATED_SIGNAL, + DIRECTORY_MONITOR_FILE_MOVED_SIGNAL, + DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL, + DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL, + DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL, + DIRECTORY_MONITOR_FILE_DELETED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL, + DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL, + DIRECTORY_MONITOR_CLOSED_SIGNAL, + DIRECTORY_MONITOR_LAST_SIGNAL +}; +static guint directory_monitor_signals[DIRECTORY_MONITOR_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -197,7 +221,9 @@ struct _DirectoryMonitorAsyncInternalNotifyDirectoryMovedData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; DirectoryMonitor* self; GFile* old_dir; GFileInfo* old_dir_info; @@ -297,7 +323,9 @@ struct _DirectoryMonitorAsyncNotifyDirectoryDeletedData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; DirectoryMonitor* self; GFile* dir; gboolean already_removed; @@ -356,7 +384,9 @@ struct _DirectoryMonitorExploreAsyncData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; DirectoryMonitor* self; GFile* dir; GFileInfo* dir_info; @@ -401,119 +431,118 @@ struct _DirectoryMonitorExploreAsyncData { gchar* _tmp35_; GFileInfo* _tmp36_; GFileType _tmp37_; - const gchar* _tmp38_; - GFile* _tmp39_; + GFile* _tmp38_; + gchar* _tmp39_; gchar* _tmp40_; - gchar* _tmp41_; - GFileInfo* _tmp42_; - GFileType _tmp43_; - GEnumValue* _tmp44_; + GFileInfo* _tmp41_; + GFileType _tmp42_; + GEnumValue* _tmp43_; + gchar* _tmp44_; gchar* _tmp45_; - gchar* _tmp46_; - gboolean _tmp47_; + gboolean _tmp46_; GeeHashMap* dir_map; GeeHashMap* file_map; GFileEnumerator* enumerator; - GFile* _tmp48_; - GCancellable* _tmp49_; - GFileEnumerator* _tmp50_; - gboolean _tmp51_; + GFile* _tmp47_; + GCancellable* _tmp48_; + GFileEnumerator* _tmp49_; + gboolean _tmp50_; GList* infos; - GFileEnumerator* _tmp52_; - GCancellable* _tmp53_; + GFileEnumerator* _tmp51_; + GCancellable* _tmp52_; + GList* _tmp53_; GList* _tmp54_; GList* _tmp55_; - GList* _tmp56_; GList* info_collection; GList* info_it; - GFileInfo* _tmp57_; + GFileInfo* _tmp56_; GFileInfo* info; - GFileInfo* _tmp58_; + GFileInfo* _tmp57_; + gchar* _tmp58_; gchar* _tmp59_; - gchar* _tmp60_; - gboolean _tmp61_; - GFileInfo* _tmp62_; - GFile* _tmp63_; + gboolean _tmp60_; + GFileInfo* _tmp61_; + GFile* _tmp62_; + gchar* _tmp63_; gchar* _tmp64_; - gchar* _tmp65_; - GFileInfo* _tmp66_; - gboolean _tmp67_; - GFile* _tmp68_; - GFileInfo* _tmp69_; - const gchar* _tmp70_; + GFileInfo* _tmp65_; + gboolean _tmp66_; + GFile* _tmp67_; + GFileInfo* _tmp68_; + const gchar* _tmp69_; + GFile* _tmp70_; GFile* _tmp71_; - GFile* _tmp72_; + gchar* _tmp72_; gchar* _tmp73_; - gchar* _tmp74_; - GFileInfo* _tmp75_; - gboolean _tmp76_; - GFileInfo* _tmp77_; - GFileType _tmp78_; + GFileInfo* _tmp74_; + gboolean _tmp75_; + GFileInfo* _tmp76_; + GFileType _tmp77_; + GeeHashMap* _tmp78_; GeeHashMap* _tmp79_; GeeHashMap* _tmp80_; - GeeHashMap* _tmp81_; - GFile* _tmp82_; - GFileInfo* _tmp83_; - const gchar* _tmp84_; + GFile* _tmp81_; + GFileInfo* _tmp82_; + const gchar* _tmp83_; + GFile* _tmp84_; GFile* _tmp85_; - GFile* _tmp86_; - GFileInfo* _tmp87_; + GFileInfo* _tmp86_; + GeeHashMap* _tmp87_; GeeHashMap* _tmp88_; GeeHashMap* _tmp89_; - GeeHashMap* _tmp90_; - GFile* _tmp91_; - GFileInfo* _tmp92_; - const gchar* _tmp93_; + GFile* _tmp90_; + GFileInfo* _tmp91_; + const gchar* _tmp92_; + GFile* _tmp93_; GFile* _tmp94_; - GFile* _tmp95_; - GFileInfo* _tmp96_; + GFileInfo* _tmp95_; GError* err2; - GFile* _tmp97_; + GFile* _tmp96_; + gchar* _tmp97_; gchar* _tmp98_; - gchar* _tmp99_; - GError* _tmp100_; - const gchar* _tmp101_; + GError* _tmp99_; + const gchar* _tmp100_; + gboolean _tmp101_; gboolean _tmp102_; - gboolean _tmp103_; - GFile* _tmp104_; - GFileInfo* _tmp105_; - GFile* _tmp106_; - GFileInfo* _tmp107_; - GFile* _tmp108_; - GFileInfo* _tmp109_; + GFile* _tmp103_; + GFileInfo* _tmp104_; + GFile* _tmp105_; + GFileInfo* _tmp106_; + GFile* _tmp107_; + GFileInfo* _tmp108_; + GeeHashMap* _tmp109_; GeeHashMap* _tmp110_; - GeeHashMap* _tmp111_; + gboolean _tmp111_; gboolean _tmp112_; gboolean _tmp113_; - gboolean _tmp114_; - GeeHashMap* _tmp115_; + GeeHashMap* _tmp114_; GeeIterator* _subdir_it; - GeeHashMap* _tmp116_; + GeeHashMap* _tmp115_; + GeeSet* _tmp116_; GeeSet* _tmp117_; GeeSet* _tmp118_; - GeeSet* _tmp119_; + GeeIterator* _tmp119_; GeeIterator* _tmp120_; GeeIterator* _tmp121_; - GeeIterator* _tmp122_; - gboolean _tmp123_; + gboolean _tmp122_; GFile* subdir; - GeeIterator* _tmp124_; - gpointer _tmp125_; + GeeIterator* _tmp123_; + gpointer _tmp124_; + gint _tmp125_; gint _tmp126_; - gint _tmp127_; - GFile* _tmp128_; - GeeHashMap* _tmp129_; - GFile* _tmp130_; - gpointer _tmp131_; - GFileInfo* _tmp132_; - gboolean _tmp133_; - GFile* _tmp134_; - GeeHashMap* _tmp135_; - GFile* _tmp136_; - gpointer _tmp137_; - GFileInfo* _tmp138_; + GFile* _tmp127_; + GeeHashMap* _tmp128_; + GFile* _tmp129_; + gpointer _tmp130_; + GFileInfo* _tmp131_; + gboolean _tmp132_; + GFile* _tmp133_; + GeeHashMap* _tmp134_; + GFile* _tmp135_; + gpointer _tmp136_; + GFileInfo* _tmp137_; + gboolean _tmp138_; gboolean _tmp139_; - gboolean _tmp140_; GError * _inner_error_; }; @@ -521,7 +550,9 @@ struct _DirectoryMonitorNotifyDirectoryFilesData { int _state_; GObject* _source_object_; GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; + GTask* _async_result; + GAsyncReadyCallback _callback_; + gboolean _task_complete_; DirectoryMonitor* self; GeeMap* map; gboolean in_discovery; @@ -656,7 +687,7 @@ static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* se void directory_monitor_notify_discovery_completed (DirectoryMonitor* self); static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self); static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); -static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile** old_file, GFileInfo** old_file_info); +static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile* * old_file, GFileInfo* * old_file_info); static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info); void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info); @@ -680,6 +711,7 @@ static void directory_monitor_real_notify_directory_created (DirectoryMonitor* s static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info, GAsyncReadyCallback _callback_, gpointer _user_data_); static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, GAsyncResult* _res_); static void directory_monitor_async_internal_notify_directory_moved_data_free (gpointer _data); +static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_); gboolean file_equal (GFile* a, GFile* b); static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); @@ -702,6 +734,7 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, GFile* dir, gboolean already_removed, GAsyncReadyCallback _callback_, gpointer _user_data_); static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, GAsyncResult* _res_); static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _data); +static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_); static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self); @@ -721,6 +754,7 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info); const gchar* g_file_type_to_string (GFileType self); static void directory_monitor_explore_async_data_free (gpointer _data); +static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_); static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info); static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, gboolean in_discovery); @@ -734,6 +768,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); static void directory_monitor_notify_directory_files (DirectoryMonitor* self, GeeMap* map, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_); static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, GAsyncResult* _res_); static void directory_monitor_notify_directory_files_data_free (gpointer _data); +static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data); static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_); static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpointer self); static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info); @@ -780,15 +815,15 @@ static void directory_monitor_real_closed (DirectoryMonitor* self); enum { DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_DUMMY_PROPERTY }; -static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement* obj); +static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj); #define DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMapPrivate)) enum { DIRECTORY_MONITOR_FILE_INFO_MAP_DUMMY_PROPERTY }; -static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile** normalized, gchar** id); +static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile* * normalized, gchar* * id); static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, GeeCollection* files); -static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap* obj); -static void directory_monitor_finalize (GObject* obj); +static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj); +static void directory_monitor_finalize (GObject * obj); static GType directory_monitor_ftype_get_type (void) { @@ -806,16 +841,16 @@ static GType directory_monitor_ftype_get_type (void) { static gpointer _g_object_ref0 (gpointer self) { #line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_object_ref (self) : NULL; -#line 810 "DirectoryMonitor.c" +#line 845 "DirectoryMonitor.c" } DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring) { DirectoryMonitor * self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE (root), NULL); #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -838,27 +873,27 @@ DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, g self->priv->monitoring = _tmp3_; #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 842 "DirectoryMonitor.c" +#line 877 "DirectoryMonitor.c" } DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) { #line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_construct (TYPE_DIRECTORY_MONITOR, root, recurse, monitoring); -#line 849 "DirectoryMonitor.c" +#line 884 "DirectoryMonitor.c" } void directory_monitor_mdbg (const gchar* msg) { #line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (msg != NULL); -#line 856 "DirectoryMonitor.c" +#line 891 "DirectoryMonitor.c" } gboolean directory_monitor_is_recursive (DirectoryMonitor* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 476 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -867,13 +902,13 @@ gboolean directory_monitor_is_recursive (DirectoryMonitor* self) { result = _tmp0_; #line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 871 "DirectoryMonitor.c" +#line 906 "DirectoryMonitor.c" } gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 480 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -882,15 +917,15 @@ gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) { result = _tmp0_; #line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 886 "DirectoryMonitor.c" +#line 921 "DirectoryMonitor.c" } static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, GFile* root) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GFile* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + GFile* _tmp3_; #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); #line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -906,8 +941,8 @@ static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self, #line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = root; #line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "root-deleted", _tmp3_); -#line 911 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL], 0, _tmp3_); +#line 946 "DirectoryMonitor.c" } @@ -916,25 +951,25 @@ void directory_monitor_notify_root_deleted (DirectoryMonitor* self, GFile* root) g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_deleted (self, root); -#line 920 "DirectoryMonitor.c" +#line 955 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { gboolean removed = FALSE; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFileInfo* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFileInfo* _tmp11_ = NULL; + DirectoryMonitorFileInfoMap* _tmp3_; + GFile* _tmp4_; + GFileInfo* _tmp5_; + gboolean _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + GFileInfo* _tmp11_; #line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -981,25 +1016,25 @@ static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self _tmp11_ = new_root_info; #line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_root_moved (self, _tmp9_, _tmp10_, _tmp11_); -#line 985 "DirectoryMonitor.c" +#line 1020 "DirectoryMonitor.c" } static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFileInfo* _tmp13_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + GFileInfo* _tmp13_; #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_root)); #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1045,8 +1080,8 @@ static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GF #line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = new_root_info; #line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "root-moved", _tmp11_, _tmp12_, _tmp13_); -#line 1050 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL], 0, _tmp11_, _tmp12_, _tmp13_); +#line 1085 "DirectoryMonitor.c" } @@ -1055,7 +1090,7 @@ void directory_monitor_notify_root_moved (DirectoryMonitor* self, GFile* old_roo g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_moved (self, old_root, new_root, new_root_info); -#line 1059 "DirectoryMonitor.c" +#line 1094 "DirectoryMonitor.c" } @@ -1063,8 +1098,8 @@ static void directory_monitor_real_notify_discovery_started (DirectoryMonitor* s #line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery started"); #line 512 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "discovery-started"); -#line 1068 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL], 0); +#line 1103 "DirectoryMonitor.c" } @@ -1073,17 +1108,17 @@ void directory_monitor_notify_discovery_started (DirectoryMonitor* self) { g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_started (self); -#line 1077 "DirectoryMonitor.c" +#line 1112 "DirectoryMonitor.c" } static void directory_monitor_real_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GFile* _tmp7_ = NULL; - GFileInfo* _tmp8_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GFileInfo* _tmp2_; + gboolean _tmp3_; + GFile* _tmp7_; + GFileInfo* _tmp8_; #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1098,10 +1133,10 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon _tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_); #line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp3_) { -#line 1102 "DirectoryMonitor.c" - GFile* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 1137 "DirectoryMonitor.c" + GFile* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; #line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1115,7 +1150,7 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon _g_free0 (_tmp6_); #line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 1118 "DirectoryMonitor.c" +#line 1153 "DirectoryMonitor.c" } #line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = file; @@ -1123,7 +1158,7 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon _tmp8_ = info; #line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_discovered (self, _tmp7_, _tmp8_); -#line 1126 "DirectoryMonitor.c" +#line 1161 "DirectoryMonitor.c" } @@ -1132,18 +1167,18 @@ void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_file_discovered (self, file, info); -#line 1135 "DirectoryMonitor.c" +#line 1170 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFileInfo* _tmp6_; #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1169,8 +1204,8 @@ static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* sel #line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; #line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-discovered", _tmp5_, _tmp6_); -#line 1173 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL], 0, _tmp5_, _tmp6_); +#line 1208 "DirectoryMonitor.c" } @@ -1179,18 +1214,18 @@ void directory_monitor_notify_file_discovered (DirectoryMonitor* self, GFile* fi g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info); -#line 1182 "DirectoryMonitor.c" +#line 1217 "DirectoryMonitor.c" } static void directory_monitor_real_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GFile* _tmp4_ = NULL; - GFileInfo* _tmp5_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GFileInfo* _tmp2_; + gboolean _tmp3_; + GFile* _tmp4_; + GFileInfo* _tmp5_; #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1213,7 +1248,7 @@ static void directory_monitor_real_internal_notify_directory_discovered (Directo _tmp5_ = info; #line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_discovered (self, _tmp4_, _tmp5_); -#line 1216 "DirectoryMonitor.c" +#line 1251 "DirectoryMonitor.c" } @@ -1222,18 +1257,18 @@ void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* s g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_directory_discovered (self, dir, info); -#line 1225 "DirectoryMonitor.c" +#line 1260 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFileInfo* _tmp6_; #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1259,8 +1294,8 @@ static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor #line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; #line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-discovered", _tmp5_, _tmp6_); -#line 1263 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL], 0, _tmp5_, _tmp6_); +#line 1298 "DirectoryMonitor.c" } @@ -1269,13 +1304,13 @@ void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, GFil g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_discovered (self, dir, info); -#line 1272 "DirectoryMonitor.c" +#line 1307 "DirectoryMonitor.c" } static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); #line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1285,8 +1320,8 @@ static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* se #line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = reason; #line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "discovery-failed", _tmp1_); -#line 1289 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL], 0, _tmp1_); +#line 1324 "DirectoryMonitor.c" } @@ -1295,14 +1330,14 @@ void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, const gc g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_failed (self, reason); -#line 1298 "DirectoryMonitor.c" +#line 1333 "DirectoryMonitor.c" } static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self) { #line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "discovery-completed"); -#line 1305 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL], 0); +#line 1340 "DirectoryMonitor.c" } @@ -1311,18 +1346,18 @@ void directory_monitor_notify_discovery_completed (DirectoryMonitor* self) { g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_completed (self); -#line 1314 "DirectoryMonitor.c" +#line 1349 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { GFile* old_file = NULL; GFileInfo* old_file_info = NULL; - GFile* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; + GFile* _tmp0_; + GFileInfo* _tmp1_; GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1345,10 +1380,10 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se old_file_info = _tmp3_; #line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp4_) { -#line 1348 "DirectoryMonitor.c" - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFileInfo* _tmp7_ = NULL; +#line 1383 "DirectoryMonitor.c" + GFile* _tmp5_; + GFile* _tmp6_; + GFileInfo* _tmp7_; #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = old_file; #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1357,16 +1392,16 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se _tmp7_ = info; #line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_moved (self, _tmp5_, _tmp6_, _tmp7_); -#line 1360 "DirectoryMonitor.c" +#line 1395 "DirectoryMonitor.c" } else { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFileInfo* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - GFile* _tmp13_ = NULL; - GFileInfo* _tmp14_ = NULL; + DirectoryMonitorFileInfoMap* _tmp8_; + GFile* _tmp9_; + GFileInfo* _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; + GFile* _tmp13_; + GFileInfo* _tmp14_; #line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = self->priv->files; #line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1387,24 +1422,24 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se _tmp14_ = info; #line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_created (self, _tmp13_, _tmp14_); -#line 1390 "DirectoryMonitor.c" +#line 1425 "DirectoryMonitor.c" } #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file_info); #line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_file); -#line 1396 "DirectoryMonitor.c" +#line 1431 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFileInfo* _tmp6_; #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1430,8 +1465,8 @@ static void directory_monitor_real_notify_file_created (DirectoryMonitor* self, #line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; #line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-created", _tmp5_, _tmp6_); -#line 1434 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_CREATED_SIGNAL], 0, _tmp5_, _tmp6_); +#line 1469 "DirectoryMonitor.c" } @@ -1440,21 +1475,21 @@ void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info); -#line 1443 "DirectoryMonitor.c" +#line 1478 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFileInfo* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFileInfo* _tmp8_ = NULL; + DirectoryMonitorFileInfoMap* _tmp2_; + GFile* _tmp3_; + GFileInfo* _tmp4_; + gboolean _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + GFileInfo* _tmp8_; #line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1489,22 +1524,22 @@ static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self _tmp8_ = new_file_info; #line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_moved (self, _tmp6_, _tmp7_, _tmp8_); -#line 1492 "DirectoryMonitor.c" +#line 1527 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFileInfo* _tmp10_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + GFileInfo* _tmp10_; #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1542,8 +1577,8 @@ static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GF #line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = new_file_info; #line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-moved", _tmp8_, _tmp9_, _tmp10_); -#line 1546 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_MOVED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); +#line 1581 "DirectoryMonitor.c" } @@ -1552,17 +1587,17 @@ void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_fil g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info); -#line 1555 "DirectoryMonitor.c" +#line 1590 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, GFile* file) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1584,8 +1619,8 @@ static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self, #line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; #line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-altered", _tmp5_); -#line 1588 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL], 0, _tmp5_); +#line 1623 "DirectoryMonitor.c" } @@ -1594,18 +1629,18 @@ void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file) g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_altered (self, file); -#line 1597 "DirectoryMonitor.c" +#line 1632 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GFile* _tmp4_ = NULL; - GFileInfo* _tmp5_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GFileInfo* _tmp2_; + gboolean _tmp3_; + GFile* _tmp4_; + GFileInfo* _tmp5_; #line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1630,18 +1665,18 @@ static void directory_monitor_internal_notify_file_alteration_completed (Directo _tmp5_ = info; #line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_alteration_completed (self, _tmp4_, _tmp5_); -#line 1633 "DirectoryMonitor.c" +#line 1668 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFileInfo* _tmp6_; #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1667,8 +1702,8 @@ static void directory_monitor_real_notify_file_alteration_completed (DirectoryMo #line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; #line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-alteration-completed", _tmp5_, _tmp6_); -#line 1671 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL], 0, _tmp5_, _tmp6_); +#line 1706 "DirectoryMonitor.c" } @@ -1677,17 +1712,17 @@ void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info); -#line 1680 "DirectoryMonitor.c" +#line 1715 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1709,8 +1744,8 @@ static void directory_monitor_real_notify_file_attributes_altered (DirectoryMoni #line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; #line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-attributes-altered", _tmp5_); -#line 1713 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL], 0, _tmp5_); +#line 1748 "DirectoryMonitor.c" } @@ -1719,16 +1754,16 @@ void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, G g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file); -#line 1722 "DirectoryMonitor.c" +#line 1757 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* self, GFile* file) { gboolean removed = FALSE; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GFile* _tmp3_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + GFile* _tmp3_; #line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1747,17 +1782,17 @@ static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* se _tmp3_ = file; #line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_deleted (self, _tmp3_); -#line 1750 "DirectoryMonitor.c" +#line 1785 "DirectoryMonitor.c" } static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, GFile* file) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); #line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1779,8 +1814,8 @@ static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self, #line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = file; #line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "file-deleted", _tmp5_); -#line 1783 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_FILE_DELETED_SIGNAL], 0, _tmp5_); +#line 1818 "DirectoryMonitor.c" } @@ -1789,18 +1824,18 @@ void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file) g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file); -#line 1792 "DirectoryMonitor.c" +#line 1827 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { GFile* old_dir = NULL; GFileInfo* old_dir_info = NULL; - GFile* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; + GFile* _tmp0_; + GFileInfo* _tmp1_; GFile* _tmp2_ = NULL; GFileInfo* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1823,14 +1858,14 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito old_dir_info = _tmp3_; #line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp4_) { -#line 1826 "DirectoryMonitor.c" - DirectoryMonitorFileInfoMap* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - DirectoryMonitorFileInfoMap* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFileInfo* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFileInfo* _tmp11_ = NULL; +#line 1861 "DirectoryMonitor.c" + DirectoryMonitorFileInfoMap* _tmp5_; + GFile* _tmp6_; + DirectoryMonitorFileInfoMap* _tmp7_; + GFile* _tmp8_; + GFileInfo* _tmp9_; + GFile* _tmp10_; + GFileInfo* _tmp11_; #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->files; #line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1849,16 +1884,16 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito _tmp11_ = info; #line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_directory_moved (self, _tmp8_, _tmp9_, _tmp10_, _tmp11_); -#line 1852 "DirectoryMonitor.c" +#line 1887 "DirectoryMonitor.c" } else { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFileInfo* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - GFile* _tmp17_ = NULL; - GFileInfo* _tmp18_ = NULL; + DirectoryMonitorFileInfoMap* _tmp12_; + GFile* _tmp13_; + GFileInfo* _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + GFile* _tmp17_; + GFileInfo* _tmp18_; #line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->files; #line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1879,24 +1914,24 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito _tmp18_ = info; #line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_created (self, _tmp17_, _tmp18_); -#line 1882 "DirectoryMonitor.c" +#line 1917 "DirectoryMonitor.c" } #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir_info); #line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (old_dir); -#line 1888 "DirectoryMonitor.c" +#line 1923 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFileInfo* _tmp6_; #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1922,8 +1957,8 @@ static void directory_monitor_real_notify_directory_created (DirectoryMonitor* s #line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; #line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-created", _tmp5_, _tmp6_); -#line 1926 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL], 0, _tmp5_, _tmp6_); +#line 1961 "DirectoryMonitor.c" } @@ -1932,15 +1967,15 @@ void directory_monitor_notify_directory_created (DirectoryMonitor* self, GFile* g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_created (self, dir, info); -#line 1935 "DirectoryMonitor.c" +#line 1970 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info) { - GFile* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; + GFile* _tmp0_; + GFileInfo* _tmp1_; + GFile* _tmp2_; + GFileInfo* _tmp3_; #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -1961,7 +1996,7 @@ static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor* _tmp3_ = new_dir_info; #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, NULL, NULL); -#line 1964 "DirectoryMonitor.c" +#line 1999 "DirectoryMonitor.c" } @@ -1980,27 +2015,51 @@ static void directory_monitor_async_internal_notify_directory_moved_data_free (g _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData, _data_); -#line 1983 "DirectoryMonitor.c" +#line 2018 "DirectoryMonitor.c" +} + + +static void directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _task_data_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_task_data_->_callback_ != NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 2030 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_task_complete_ = TRUE; +#line 2034 "DirectoryMonitor.c" } static void directory_monitor_async_internal_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFileInfo* old_dir_info, GFile* new_dir, GFileInfo* new_dir_info, GAsyncReadyCallback _callback_, gpointer _user_data_) { DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; - DirectoryMonitor* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; - GFileInfo* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFileInfo* _tmp7_ = NULL; - GFileInfo* _tmp8_ = NULL; + DirectoryMonitor* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFileInfo* _tmp3_; + GFileInfo* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GFileInfo* _tmp7_; + GFileInfo* _tmp8_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_async_internal_notify_directory_moved); + _data_->_callback_ = _callback_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_async_internal_notify_directory_moved_data_free); + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_async_internal_notify_directory_moved_async_ready_wrapper, _user_data_); +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_callback_ == NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 2059 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_async_internal_notify_directory_moved_data_free); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _g_object_ref0 (self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2039,15 +2098,15 @@ static void directory_monitor_async_internal_notify_directory_moved (DirectoryMo _data_->new_dir_info = _tmp8_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_co (_data_); -#line 2042 "DirectoryMonitor.c" +#line 2101 "DirectoryMonitor.c" } static void directory_monitor_async_internal_notify_directory_moved_finish (DirectoryMonitor* self, GAsyncResult* _res_) { DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2050 "DirectoryMonitor.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 2109 "DirectoryMonitor.c" } @@ -2056,7 +2115,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2059 "DirectoryMonitor.c" +#line 2118 "DirectoryMonitor.c" } @@ -2069,8 +2128,10 @@ static void directory_monitor_async_internal_notify_directory_moved_ready (GObje #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_res_ = _res_; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_co (_data_); -#line 2073 "DirectoryMonitor.c" +#line 2134 "DirectoryMonitor.c" } @@ -2079,7 +2140,7 @@ static gboolean _directory_monitor_async_internal_notify_directory_moved_co_gsou result = directory_monitor_async_internal_notify_directory_moved_co (self); #line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2082 "DirectoryMonitor.c" +#line 2143 "DirectoryMonitor.c" } @@ -2088,85 +2149,59 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire switch (_data_->_state_) { #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 2091 "DirectoryMonitor.c" +#line 2152 "DirectoryMonitor.c" goto _state_0; #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 2095 "DirectoryMonitor.c" +#line 2156 "DirectoryMonitor.c" goto _state_1; #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 2099 "DirectoryMonitor.c" +#line 2160 "DirectoryMonitor.c" goto _state_2; default: #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 2104 "DirectoryMonitor.c" +#line 2165 "DirectoryMonitor.c" } _state_0: #line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = NULL; -#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = 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 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = NULL; -#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = 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 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp2_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->self->priv->files; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = _data_->old_dir; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->file_children; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = _data_->dir_children; #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = 0; -#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->count = _data_->_tmp6_; #line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = 0; -#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = _data_->count; #line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp7_ > 0) { -#line 2147 "DirectoryMonitor.c" +#line 2192 "DirectoryMonitor.c" { #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = NULL; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->dir_children; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = NULL; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_list = _data_->_tmp9_; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = NULL; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = _data_->_dir_child_list; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = 0; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = 0; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = _data_->_tmp11_; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_size = _data_->_tmp12_; @@ -2175,70 +2210,44 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = 0; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = _data_->_dir_child_index; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = _data_->_tmp13_ + 1; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = 0; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = _data_->_dir_child_index; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = 0; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = _data_->_dir_child_size; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp14_ < _data_->_tmp15_)) { #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2195 "DirectoryMonitor.c" +#line 2224 "DirectoryMonitor.c" } #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = NULL; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = _data_->_dir_child_list; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp17_ = 0; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = _data_->_dir_child_index; #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp18_ = NULL; -#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_child = (GFile*) _data_->_tmp18_; #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp19_ = NULL; -#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = _data_->self->priv->files; #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp20_ = NULL; -#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = _data_->dir_child; #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp21_ = NULL; -#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = directory_monitor_file_info_map_get_info (_data_->_tmp19_, _data_->_tmp20_); #line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_info = _data_->_tmp21_; #line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp22_ = NULL; -#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = _data_->dir_info; #line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp22_ == NULL) { #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = NULL; -#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = _data_->dir_child; #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp24_ = NULL; -#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = g_file_get_path (_data_->_tmp23_); #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp25_ = NULL; -#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = _data_->_tmp24_; #line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:662: Unable to retrieve directory-moved info for" \ @@ -2251,43 +2260,25 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire _g_object_unref0 (_data_->dir_child); #line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 2253 "DirectoryMonitor.c" +#line 2262 "DirectoryMonitor.c" } #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp26_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = _data_->dir_child; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp27_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = _data_->dir_info; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp28_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = _data_->new_dir; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp29_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = _data_->dir_child; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp30_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = g_file_get_basename (_data_->_tmp29_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp31_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = _data_->_tmp30_; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = g_file_get_child (_data_->_tmp28_, _data_->_tmp31_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = _data_->_tmp32_; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = NULL; -#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = _data_->dir_info; #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; @@ -2295,7 +2286,7 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire directory_monitor_async_internal_notify_directory_moved (_data_->self, _data_->_tmp26_, _data_->_tmp27_, _data_->_tmp33_, _data_->_tmp34_, directory_monitor_async_internal_notify_directory_moved_ready, _data_); #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2297 "DirectoryMonitor.c" +#line 2288 "DirectoryMonitor.c" _state_1: #line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_internal_notify_directory_moved_finish (_data_->self, _data_->_res_); @@ -2307,34 +2298,24 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire _g_object_unref0 (_data_->dir_info); #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 2309 "DirectoryMonitor.c" +#line 2300 "DirectoryMonitor.c" } #line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_dir_child_list); -#line 2313 "DirectoryMonitor.c" +#line 2304 "DirectoryMonitor.c" } { #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = NULL; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = _data_->file_children; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp36_ = NULL; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = _g_object_ref0 (_data_->_tmp35_); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_list = _data_->_tmp36_; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp37_ = NULL; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = _data_->_file_child_list; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp38_ = 0; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp39_ = 0; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp39_ = _data_->_tmp38_; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_size = _data_->_tmp39_; @@ -2343,70 +2324,44 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp40_ = 0; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp40_ = _data_->_file_child_index; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = _data_->_tmp40_ + 1; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp41_ = 0; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp41_ = _data_->_file_child_index; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp42_ = 0; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp42_ = _data_->_file_child_size; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp41_ < _data_->_tmp42_)) { #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 2362 "DirectoryMonitor.c" +#line 2337 "DirectoryMonitor.c" } #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp43_ = NULL; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp43_ = _data_->_file_child_list; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp44_ = 0; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp44_ = _data_->_file_child_index; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp45_ = NULL; -#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp45_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp43_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp44_); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_child = (GFile*) _data_->_tmp45_; #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp46_ = NULL; -#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp46_ = _data_->self->priv->files; #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp47_ = NULL; -#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp47_ = _data_->file_child; #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp48_ = NULL; -#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp48_ = directory_monitor_file_info_map_get_info (_data_->_tmp46_, _data_->_tmp47_); #line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_info = _data_->_tmp48_; #line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp49_ = NULL; -#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp49_ = _data_->file_info; #line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp49_ == NULL) { #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp50_ = NULL; -#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp50_ = _data_->file_child; #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp51_ = NULL; -#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp51_ = g_file_get_path (_data_->_tmp50_); #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp52_ = NULL; -#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp52_ = _data_->_tmp51_; #line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:675: Unable to retrieve directory-moved info for" \ @@ -2419,39 +2374,23 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire _g_object_unref0 (_data_->file_child); #line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 2420 "DirectoryMonitor.c" +#line 2375 "DirectoryMonitor.c" } #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp53_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp53_ = _data_->file_child; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp54_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp54_ = _data_->new_dir; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp55_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp55_ = _data_->file_child; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp56_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp56_ = g_file_get_basename (_data_->_tmp55_); #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp57_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp57_ = _data_->_tmp56_; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp58_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp58_ = g_file_get_child (_data_->_tmp54_, _data_->_tmp57_); #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp59_ = _data_->_tmp58_; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = NULL; -#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp60_ = _data_->file_info; #line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_moved (_data_->self, _data_->_tmp53_, _data_->_tmp59_, _data_->_tmp60_); @@ -2465,81 +2404,55 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire _data_->_state_ = 2; #line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2466 "DirectoryMonitor.c" +#line 2405 "DirectoryMonitor.c" _state_2: ; #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_info); #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 2473 "DirectoryMonitor.c" +#line 2412 "DirectoryMonitor.c" } #line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_file_child_list); -#line 2477 "DirectoryMonitor.c" +#line 2416 "DirectoryMonitor.c" } } #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = NULL; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp61_ = _data_->self->priv->files; #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = NULL; -#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp62_ = _data_->old_dir; #line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_data_->_tmp61_, _data_->_tmp62_, NULL); #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = NULL; -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp63_ = _data_->self->priv->files; #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp64_ = NULL; -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp64_ = _data_->new_dir; #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp65_ = NULL; -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp65_ = _data_->new_dir_info; #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = FALSE; -#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp66_ = directory_monitor_file_info_map_update (_data_->_tmp63_, _data_->_tmp64_, _data_->_tmp65_); #line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->updated = _data_->_tmp66_; #line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_data_->updated, "updated"); #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = NULL; -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp67_ = _data_->old_dir; #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = NULL; -#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp68_ = _data_->old_dir_info; #line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_remove_monitor (_data_->self, _data_->_tmp67_, _data_->_tmp68_); #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = NULL; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp69_ = _data_->new_dir; #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = NULL; -#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp70_ = _data_->new_dir_info; #line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_add_monitor (_data_->self, _data_->_tmp69_, _data_->_tmp70_); #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = NULL; -#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp71_ = _data_->old_dir; #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = NULL; -#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp72_ = _data_->new_dir; #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = NULL; -#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp73_ = _data_->new_dir_info; #line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_moved (_data_->self, _data_->_tmp71_, _data_->_tmp72_, _data_->_tmp73_); @@ -2548,38 +2461,39 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_children); #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2552 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 2556 "DirectoryMonitor.c" + while (_data_->_task_complete_ != TRUE) { +#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 2469 "DirectoryMonitor.c" + } } #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 2562 "DirectoryMonitor.c" +#line 2476 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFileInfo* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + GFileInfo* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + gboolean _tmp13_; #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (old_dir)); #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2617,7 +2531,7 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel #line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = new_dir_info; #line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-moved", _tmp8_, _tmp9_, _tmp10_); + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL], 0, _tmp8_, _tmp9_, _tmp10_); #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = old_dir; #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2626,10 +2540,10 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel _tmp13_ = g_file_equal (_tmp11_, _tmp12_); #line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp13_) { -#line 2627 "DirectoryMonitor.c" - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - GFileInfo* _tmp16_ = NULL; +#line 2541 "DirectoryMonitor.c" + GFile* _tmp14_; + GFile* _tmp15_; + GFileInfo* _tmp16_; #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = old_dir; #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2638,7 +2552,7 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel _tmp16_ = new_dir_info; #line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_root_moved (self, _tmp14_, _tmp15_, _tmp16_); -#line 2639 "DirectoryMonitor.c" +#line 2553 "DirectoryMonitor.c" } } @@ -2648,17 +2562,17 @@ void directory_monitor_notify_directory_moved (DirectoryMonitor* self, GFile* ol g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_moved (self, old_dir, new_dir, new_dir_info); -#line 2649 "DirectoryMonitor.c" +#line 2563 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* self, GFile* dir) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2680,8 +2594,8 @@ static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* s #line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; #line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-altered", _tmp5_); -#line 2682 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL], 0, _tmp5_); +#line 2596 "DirectoryMonitor.c" } @@ -2690,18 +2604,18 @@ void directory_monitor_notify_directory_altered (DirectoryMonitor* self, GFile* g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_altered (self, dir); -#line 2691 "DirectoryMonitor.c" +#line 2605 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { gboolean updated = FALSE; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GFile* _tmp4_ = NULL; - GFileInfo* _tmp5_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GFileInfo* _tmp2_; + gboolean _tmp3_; + GFile* _tmp4_; + GFileInfo* _tmp5_; #line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2726,18 +2640,18 @@ static void directory_monitor_internal_notify_directory_alteration_completed (Di _tmp5_ = info; #line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_alteration_completed (self, _tmp4_, _tmp5_); -#line 2727 "DirectoryMonitor.c" +#line 2641 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFileInfo* _tmp6_; #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2763,8 +2677,8 @@ static void directory_monitor_real_notify_directory_alteration_completed (Direct #line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = info; #line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-alteration-completed", _tmp5_, _tmp6_); -#line 2765 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL], 0, _tmp5_, _tmp6_); +#line 2679 "DirectoryMonitor.c" } @@ -2773,17 +2687,17 @@ void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_alteration_completed (self, dir, info); -#line 2774 "DirectoryMonitor.c" +#line 2688 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2805,8 +2719,8 @@ static void directory_monitor_real_notify_directory_attributes_altered (Director #line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; #line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-attributes-altered", _tmp5_); -#line 2807 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL], 0, _tmp5_); +#line 2721 "DirectoryMonitor.c" } @@ -2815,17 +2729,17 @@ void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* se g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_attributes_altered (self, dir); -#line 2816 "DirectoryMonitor.c" +#line 2730 "DirectoryMonitor.c" } static void directory_monitor_internal_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) { GFileInfo* info = NULL; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GFileInfo* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2850,7 +2764,7 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito directory_monitor_async_notify_directory_deleted (self, _tmp4_, FALSE, NULL, NULL); #line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (info); -#line 2851 "DirectoryMonitor.c" +#line 2765 "DirectoryMonitor.c" } @@ -2863,22 +2777,46 @@ static void directory_monitor_async_notify_directory_deleted_data_free (gpointer _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorAsyncNotifyDirectoryDeletedData, _data_); -#line 2864 "DirectoryMonitor.c" +#line 2778 "DirectoryMonitor.c" +} + + +static void directory_monitor_async_notify_directory_deleted_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + DirectoryMonitorAsyncNotifyDirectoryDeletedData* _task_data_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_task_data_->_callback_ != NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 2790 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_task_complete_ = TRUE; +#line 2794 "DirectoryMonitor.c" } static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* self, GFile* dir, gboolean already_removed, GAsyncReadyCallback _callback_, gpointer _user_data_) { DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; - DirectoryMonitor* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + DirectoryMonitor* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorAsyncNotifyDirectoryDeletedData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_async_notify_directory_deleted); + _data_->_callback_ = _callback_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_async_notify_directory_deleted_async_ready_wrapper, _user_data_); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_async_notify_directory_deleted_data_free); + if (_callback_ == NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 2814 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_async_notify_directory_deleted_data_free); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _g_object_ref0 (self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2897,15 +2835,15 @@ static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor* _data_->already_removed = _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_co (_data_); -#line 2898 "DirectoryMonitor.c" +#line 2836 "DirectoryMonitor.c" } static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMonitor* self, GAsyncResult* _res_) { DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2906 "DirectoryMonitor.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 2844 "DirectoryMonitor.c" } @@ -2918,8 +2856,10 @@ static void directory_monitor_async_notify_directory_deleted_ready (GObject* sou #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_res_ = _res_; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_co (_data_); -#line 2920 "DirectoryMonitor.c" +#line 2860 "DirectoryMonitor.c" } @@ -2928,7 +2868,7 @@ static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_fun result = directory_monitor_async_notify_directory_deleted_co (self); #line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 2929 "DirectoryMonitor.c" +#line 2869 "DirectoryMonitor.c" } @@ -2937,85 +2877,59 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo switch (_data_->_state_) { #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 2938 "DirectoryMonitor.c" +#line 2878 "DirectoryMonitor.c" goto _state_0; #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 2942 "DirectoryMonitor.c" +#line 2882 "DirectoryMonitor.c" goto _state_1; #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 2946 "DirectoryMonitor.c" +#line 2886 "DirectoryMonitor.c" goto _state_2; default: #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 2951 "DirectoryMonitor.c" +#line 2891 "DirectoryMonitor.c" } _state_0: #line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = NULL; -#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = 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 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; #line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = NULL; -#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = 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 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp2_ = NULL; -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->self->priv->files; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = NULL; -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = _data_->dir; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = NULL; -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->file_children; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = NULL; -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = _data_->dir_children; #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = 0; -#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->count = _data_->_tmp6_; #line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = 0; -#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = _data_->count; #line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp7_ > 0) { -#line 2994 "DirectoryMonitor.c" +#line 2918 "DirectoryMonitor.c" { #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->dir_children; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_list = _data_->_tmp9_; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = _data_->_dir_child_list; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = 0; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = 0; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = _data_->_tmp11_; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_size = _data_->_tmp12_; @@ -3024,42 +2938,28 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = 0; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = _data_->_dir_child_index; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_dir_child_index = _data_->_tmp13_ + 1; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = 0; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = _data_->_dir_child_index; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = 0; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = _data_->_dir_child_size; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp14_ < _data_->_tmp15_)) { #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3042 "DirectoryMonitor.c" +#line 2950 "DirectoryMonitor.c" } #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = _data_->_dir_child_list; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp17_ = 0; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = _data_->_dir_child_index; #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp18_ = NULL; -#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_child = (GFile*) _data_->_tmp18_; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp19_ = NULL; -#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = _data_->dir_child; #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; @@ -3067,40 +2967,30 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo directory_monitor_async_notify_directory_deleted (_data_->self, _data_->_tmp19_, FALSE, directory_monitor_async_notify_directory_deleted_ready, _data_); #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3068 "DirectoryMonitor.c" +#line 2968 "DirectoryMonitor.c" _state_1: #line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_async_notify_directory_deleted_finish (_data_->self, _data_->_res_); #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_child); -#line 3074 "DirectoryMonitor.c" +#line 2974 "DirectoryMonitor.c" } #line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_dir_child_list); -#line 3078 "DirectoryMonitor.c" +#line 2978 "DirectoryMonitor.c" } { #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp20_ = NULL; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = _data_->file_children; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp21_ = NULL; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = _g_object_ref0 (_data_->_tmp20_); #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_list = _data_->_tmp21_; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp22_ = NULL; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = _data_->_file_child_list; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = 0; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp24_ = 0; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = _data_->_tmp23_; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_size = _data_->_tmp24_; @@ -3109,52 +2999,34 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp25_ = 0; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = _data_->_file_child_index; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_file_child_index = _data_->_tmp25_ + 1; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp26_ = 0; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = _data_->_file_child_index; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp27_ = 0; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = _data_->_file_child_size; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_data_->_tmp26_ < _data_->_tmp27_)) { #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3127 "DirectoryMonitor.c" +#line 3011 "DirectoryMonitor.c" } #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp28_ = NULL; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = _data_->_file_child_list; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp29_ = 0; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = _data_->_file_child_index; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp30_ = NULL; -#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp29_); #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_child = (GFile*) _data_->_tmp30_; #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp31_ = NULL; -#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = _data_->self->priv->files; #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = NULL; -#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = _data_->file_child; #line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_data_->_tmp31_, _data_->_tmp32_, NULL); #line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = NULL; -#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = _data_->file_child; #line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_deleted (_data_->self, _data_->_tmp33_); @@ -3164,39 +3036,31 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo _data_->_state_ = 2; #line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3165 "DirectoryMonitor.c" +#line 3037 "DirectoryMonitor.c" _state_2: ; #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_child); -#line 3170 "DirectoryMonitor.c" +#line 3042 "DirectoryMonitor.c" } #line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_file_child_list); -#line 3174 "DirectoryMonitor.c" +#line 3046 "DirectoryMonitor.c" } } #line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = FALSE; -#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = _data_->already_removed; #line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_data_->_tmp34_) { #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = NULL; -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = _data_->self->priv->files; #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp36_ = NULL; -#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = _data_->dir; #line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove (_data_->_tmp35_, _data_->_tmp36_, NULL); -#line 3193 "DirectoryMonitor.c" +#line 3059 "DirectoryMonitor.c" } #line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp37_ = NULL; -#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = _data_->dir; #line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_deleted (_data_->self, _data_->_tmp37_); @@ -3205,33 +3069,34 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_children); #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3209 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { +#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + while (_data_->_task_complete_ != TRUE) { #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3213 "DirectoryMonitor.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 3077 "DirectoryMonitor.c" + } } #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3219 "DirectoryMonitor.c" +#line 3084 "DirectoryMonitor.c" } static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + gboolean _tmp8_; #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); #line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3253,7 +3118,7 @@ static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* s #line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = dir; #line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "directory-deleted", _tmp5_); + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL], 0, _tmp5_); #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = dir; #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3262,13 +3127,13 @@ static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* s _tmp8_ = g_file_equal (_tmp6_, _tmp7_); #line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp8_) { -#line 3263 "DirectoryMonitor.c" - GFile* _tmp9_ = NULL; +#line 3128 "DirectoryMonitor.c" + GFile* _tmp9_; #line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = dir; #line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_root_deleted (self, _tmp9_); -#line 3269 "DirectoryMonitor.c" +#line 3134 "DirectoryMonitor.c" } } @@ -3278,16 +3143,16 @@ void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, GFile* g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_deleted (self, dir); -#line 3279 "DirectoryMonitor.c" +#line 3144 "DirectoryMonitor.c" } static void directory_monitor_real_notify_closed (DirectoryMonitor* self) { - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->root; #line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3305,8 +3170,8 @@ static void directory_monitor_real_notify_closed (DirectoryMonitor* self) { #line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp2_); #line 792 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_emit_by_name (self, "closed"); -#line 3307 "DirectoryMonitor.c" + g_signal_emit (self, directory_monitor_signals[DIRECTORY_MONITOR_CLOSED_SIGNAL], 0); +#line 3172 "DirectoryMonitor.c" } @@ -3315,14 +3180,14 @@ void directory_monitor_notify_closed (DirectoryMonitor* self) { g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->notify_closed (self); -#line 3316 "DirectoryMonitor.c" +#line 3181 "DirectoryMonitor.c" } GFile* directory_monitor_get_root (DirectoryMonitor* self) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 795 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); #line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3333,15 +3198,15 @@ GFile* directory_monitor_get_root (DirectoryMonitor* self) { result = _tmp1_; #line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3334 "DirectoryMonitor.c" +#line 3199 "DirectoryMonitor.c" } gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) { gboolean result = FALSE; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; #line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3356,13 +3221,13 @@ gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) { result = _tmp2_; #line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3357 "DirectoryMonitor.c" +#line 3222 "DirectoryMonitor.c" } gboolean directory_monitor_has_started (DirectoryMonitor* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 803 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3371,13 +3236,13 @@ gboolean directory_monitor_has_started (DirectoryMonitor* self) { result = _tmp0_; #line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3372 "DirectoryMonitor.c" +#line 3237 "DirectoryMonitor.c" } void directory_monitor_start_discovery (DirectoryMonitor* self) { - gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; + gboolean _tmp0_; + GFile* _tmp1_; #line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 808 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3396,26 +3261,26 @@ void directory_monitor_start_discovery (DirectoryMonitor* self) { _tmp1_ = self->priv->root; #line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async (self, _tmp1_, NULL, TRUE, NULL, NULL); -#line 3397 "DirectoryMonitor.c" +#line 3262 "DirectoryMonitor.c" } static void directory_monitor_real_close (DirectoryMonitor* self) { - GCancellable* _tmp0_ = NULL; - GeeHashMap* _tmp12_ = NULL; + GCancellable* _tmp0_; + GeeHashMap* _tmp12_; #line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->cancellable; #line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_cancellable_cancel (_tmp0_); -#line 3408 "DirectoryMonitor.c" +#line 3273 "DirectoryMonitor.c" { GeeIterator* _monitor_it = NULL; - GeeHashMap* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + GeeHashMap* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeIterator* _tmp5_; + GeeIterator* _tmp6_; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->monitors; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3434,13 +3299,13 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { _monitor_it = _tmp6_; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 3435 "DirectoryMonitor.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 3300 "DirectoryMonitor.c" + GeeIterator* _tmp7_; + gboolean _tmp8_; GFileMonitor* monitor = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; - GFileMonitor* _tmp11_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GFileMonitor* _tmp11_; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _monitor_it; #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3449,7 +3314,7 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { if (!_tmp8_) { #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 3450 "DirectoryMonitor.c" +#line 3315 "DirectoryMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _monitor_it; @@ -3463,11 +3328,11 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { directory_monitor_cancel_monitor (self, _tmp11_); #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); -#line 3464 "DirectoryMonitor.c" +#line 3329 "DirectoryMonitor.c" } #line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_monitor_it); -#line 3468 "DirectoryMonitor.c" +#line 3333 "DirectoryMonitor.c" } #line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->monitors; @@ -3475,7 +3340,7 @@ static void directory_monitor_real_close (DirectoryMonitor* self) { gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 832 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_closed (self); -#line 3476 "DirectoryMonitor.c" +#line 3341 "DirectoryMonitor.c" } @@ -3484,16 +3349,16 @@ void directory_monitor_close (DirectoryMonitor* self) { g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" DIRECTORY_MONITOR_GET_CLASS (self)->close (self); -#line 3485 "DirectoryMonitor.c" +#line 3350 "DirectoryMonitor.c" } static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) { DirectoryMonitorFType result = 0; GFileType file_type = 0; - GFileInfo* _tmp0_ = NULL; - GFileType _tmp1_ = 0; - GFileType _tmp2_ = 0; + GFileInfo* _tmp0_; + GFileType _tmp1_; + GFileType _tmp2_; #line 835 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), 0); #line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3508,30 +3373,30 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) { switch (_tmp2_) { #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_REGULAR: -#line 3509 "DirectoryMonitor.c" +#line 3374 "DirectoryMonitor.c" { #line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_FILE; #line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3515 "DirectoryMonitor.c" +#line 3380 "DirectoryMonitor.c" } #line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_DIRECTORY: -#line 3519 "DirectoryMonitor.c" +#line 3384 "DirectoryMonitor.c" { #line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_FTYPE_DIRECTORY; #line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3525 "DirectoryMonitor.c" +#line 3390 "DirectoryMonitor.c" } default: { - GFileType _tmp3_ = 0; + GFileType _tmp3_; GEnumValue* _tmp4_; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp5_; + gchar* _tmp6_; #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = file_type; #line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3548,7 +3413,7 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) { result = DIRECTORY_MONITOR_FTYPE_UNSUPPORTED; #line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3549 "DirectoryMonitor.c" +#line 3414 "DirectoryMonitor.c" } } } @@ -3565,24 +3430,48 @@ static void directory_monitor_explore_async_data_free (gpointer _data) { _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorExploreAsyncData, _data_); -#line 3566 "DirectoryMonitor.c" +#line 3431 "DirectoryMonitor.c" +} + + +static void directory_monitor_explore_async_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + DirectoryMonitorExploreAsyncData* _task_data_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_task_data_->_callback_ != NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 3443 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_task_complete_ = TRUE; +#line 3447 "DirectoryMonitor.c" } static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, GFileInfo* dir_info, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_) { DirectoryMonitorExploreAsyncData* _data_; - DirectoryMonitor* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; - GFileInfo* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + DirectoryMonitor* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFileInfo* _tmp3_; + GFileInfo* _tmp4_; + gboolean _tmp5_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorExploreAsyncData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_explore_async); + _data_->_callback_ = _callback_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_explore_async_async_ready_wrapper, _user_data_); +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_callback_ == NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 3469 "DirectoryMonitor.c" + } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_explore_async_data_free); + g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_explore_async_data_free); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _g_object_ref0 (self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3609,15 +3498,15 @@ static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir, _data_->in_discovery = _tmp5_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async_co (_data_); -#line 3610 "DirectoryMonitor.c" +#line 3499 "DirectoryMonitor.c" } static void directory_monitor_explore_finish (DirectoryMonitor* self, GAsyncResult* _res_) { DirectoryMonitorExploreAsyncData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 3618 "DirectoryMonitor.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 3507 "DirectoryMonitor.c" } @@ -3630,15 +3519,17 @@ static void directory_monitor_explore_async_ready (GObject* source_object, GAsyn #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_res_ = _res_; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_async_co (_data_); -#line 3632 "DirectoryMonitor.c" +#line 3523 "DirectoryMonitor.c" } static void _g_object_unref0_ (gpointer var) { #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 3639 "DirectoryMonitor.c" +#line 3530 "DirectoryMonitor.c" } @@ -3647,7 +3538,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) { g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_list_free (self); -#line 3648 "DirectoryMonitor.c" +#line 3539 "DirectoryMonitor.c" } @@ -3656,7 +3547,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 3657 "DirectoryMonitor.c" +#line 3548 "DirectoryMonitor.c" } @@ -3665,63 +3556,49 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync switch (_data_->_state_) { #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 3666 "DirectoryMonitor.c" +#line 3557 "DirectoryMonitor.c" goto _state_0; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 3670 "DirectoryMonitor.c" +#line 3561 "DirectoryMonitor.c" goto _state_1; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 2: -#line 3674 "DirectoryMonitor.c" +#line 3565 "DirectoryMonitor.c" goto _state_2; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 3: -#line 3678 "DirectoryMonitor.c" +#line 3569 "DirectoryMonitor.c" goto _state_3; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 4: -#line 3682 "DirectoryMonitor.c" +#line 3573 "DirectoryMonitor.c" goto _state_4; #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 5: -#line 3686 "DirectoryMonitor.c" +#line 3577 "DirectoryMonitor.c" goto _state_5; default: #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 3691 "DirectoryMonitor.c" +#line 3582 "DirectoryMonitor.c" } _state_0: #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = NULL; -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = _data_->self->priv->files; #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = NULL; -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = _data_->dir; #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp2_ = NULL; -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->dir_info; #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = FALSE; -#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = directory_monitor_file_info_map_contains (_data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_); #line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp3_) { #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = NULL; -#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->dir; #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = NULL; -#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = g_file_get_path (_data_->_tmp4_); #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = NULL; -#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = _data_->_tmp5_; #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:852: Directory loop detected at %s, not explorin" \ @@ -3729,52 +3606,41 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp6_); #line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = FALSE; -#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = _data_->in_discovery; #line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp7_); #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3738 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { +#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + while (_data_->_task_complete_ != TRUE) { #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3742 "DirectoryMonitor.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 3617 "DirectoryMonitor.c" + } } #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3748 "DirectoryMonitor.c" +#line 3624 "DirectoryMonitor.c" } #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->dir_info; #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_); #line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->local_dir_info = _data_->_tmp9_; #line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = NULL; -#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = _data_->local_dir_info; #line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp10_ == NULL) { -#line 3766 "DirectoryMonitor.c" +#line 3636 "DirectoryMonitor.c" { #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = NULL; -#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = _data_->dir; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = NULL; -#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = _data_->self->priv->cancellable; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 1; @@ -3782,22 +3648,18 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync g_file_query_info_async (_data_->_tmp12_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_DIR_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp13_, directory_monitor_explore_async_ready, _data_); #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3782 "DirectoryMonitor.c" +#line 3648 "DirectoryMonitor.c" _state_1: #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = NULL; -#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = g_file_query_info_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = _data_->_tmp14_; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3792 "DirectoryMonitor.c" - goto __catch480_g_error; +#line 3656 "DirectoryMonitor.c" + goto __catch481_g_error; } #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = NULL; -#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = _data_->_tmp11_; #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = NULL; @@ -3807,42 +3669,30 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync _data_->local_dir_info = _data_->_tmp15_; #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp11_); -#line 3807 "DirectoryMonitor.c" +#line 3669 "DirectoryMonitor.c" } - goto __finally480; - __catch480_g_error: + goto __finally481; + __catch481_g_error: { #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->err = _data_->_inner_error_; #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_inner_error_ = NULL; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = _data_->dir; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp17_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp17_ = g_file_get_path (_data_->_tmp16_); #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp18_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp18_ = _data_->_tmp17_; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp19_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp19_ = _data_->err; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp20_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp20_ = _data_->_tmp19_->message; #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:866: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_); #line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp18_); #line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp21_ = FALSE; -#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp21_ = _data_->in_discovery; #line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp21_); @@ -3851,22 +3701,23 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3854 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3858 "DirectoryMonitor.c" + while (_data_->_task_complete_ != TRUE) { +#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 3708 "DirectoryMonitor.c" + } } #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3864 "DirectoryMonitor.c" +#line 3715 "DirectoryMonitor.c" } - __finally480: + __finally481: #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -3876,570 +3727,412 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_data_->_inner_error_); #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_object_unref (_data_->_async_result); +#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3877 "DirectoryMonitor.c" +#line 3730 "DirectoryMonitor.c" } } #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp22_ = NULL; -#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp22_ = _data_->local_dir_info; #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp23_ = FALSE; -#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp23_ = g_file_info_get_is_hidden (_data_->_tmp22_); #line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp23_) { #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp24_ = NULL; -#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp24_ = _data_->dir; #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp25_ = NULL; -#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp25_ = g_file_get_path (_data_->_tmp24_); #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp26_ = NULL; -#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp26_ = _data_->_tmp25_; #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:875: Ignoring hidden directory %s", _data_->_tmp26_); #line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp26_); #line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp27_ = FALSE; -#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp27_ = _data_->in_discovery; #line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp27_); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3918 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 3922 "DirectoryMonitor.c" + while (_data_->_task_complete_ != TRUE) { +#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 3763 "DirectoryMonitor.c" + } } #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 3928 "DirectoryMonitor.c" +#line 3770 "DirectoryMonitor.c" } #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp28_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp28_ = _data_->local_dir_info; #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp29_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp29_ = get_file_info_id (_data_->_tmp28_); #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp30_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp30_ = _data_->_tmp29_; #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp31_ = FALSE; -#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp31_ = _data_->_tmp30_ == NULL; #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp30_); #line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp31_) { #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp32_ = NULL; -#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp32_ = _data_->local_dir_info; #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp33_ = NULL; -#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp33_ = _data_->dir; #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp34_ = NULL; -#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp34_ = g_file_get_uri (_data_->_tmp33_); #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp35_ = NULL; -#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp35_ = _data_->_tmp34_; #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_info_set_attribute_string (_data_->_tmp32_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp35_); #line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_data_->_tmp35_); -#line 3970 "DirectoryMonitor.c" +#line 3796 "DirectoryMonitor.c" } #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp36_ = NULL; -#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp36_ = _data_->local_dir_info; #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp37_ = 0; -#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp37_ = g_file_info_get_file_type (_data_->_tmp36_); #line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp37_ != G_FILE_TYPE_DIRECTORY) { #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp38_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp38_ = _ ("Unable to monitor %s: Not a directory (%s)"); -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp39_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp39_ = _data_->dir; + _data_->_tmp38_ = _data_->dir; #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp40_ = NULL; + _data_->_tmp39_ = g_file_get_path (_data_->_tmp38_); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp40_ = g_file_get_path (_data_->_tmp39_); + _data_->_tmp40_ = _data_->_tmp39_; #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp41_ = _data_->local_dir_info; #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp41_ = _data_->_tmp40_; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp42_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp42_ = _data_->local_dir_info; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp43_ = 0; -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp43_ = g_file_info_get_file_type (_data_->_tmp42_); -#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - memset (&_data_->_tmp44_, 0, sizeof (GEnumValue*)); + _data_->_tmp42_ = g_file_info_get_file_type (_data_->_tmp41_); #line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp44_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp43_); + _data_->_tmp43_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp42_); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp45_ = NULL; + _data_->_tmp44_ = g_strdup_printf (_ ("Unable to monitor %s: Not a directory (%s)"), _data_->_tmp40_, (_data_->_tmp43_ != NULL) ? _data_->_tmp43_->value_name : NULL); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp45_ = g_strdup_printf (_data_->_tmp38_, _data_->_tmp41_, (_data_->_tmp44_ != NULL) ? _data_->_tmp44_->value_name : NULL); + _data_->_tmp45_ = _data_->_tmp44_; #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp46_ = NULL; + directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp45_); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp46_ = _data_->_tmp45_; + _g_free0 (_data_->_tmp45_); #line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp46_); -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp46_); -#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp41_); -#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp47_ = FALSE; + _g_free0 (_data_->_tmp40_); #line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp47_ = _data_->in_discovery; + _data_->_tmp46_ = _data_->in_discovery; #line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp47_); + directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp46_); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4036 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { +#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + while (_data_->_task_complete_ != TRUE) { #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 4040 "DirectoryMonitor.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 3840 "DirectoryMonitor.c" + } } #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4046 "DirectoryMonitor.c" +#line 3847 "DirectoryMonitor.c" } #line 903 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_map = NULL; #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_map = NULL; -#line 4052 "DirectoryMonitor.c" +#line 3853 "DirectoryMonitor.c" { #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp48_ = NULL; -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp48_ = _data_->dir; + _data_->_tmp47_ = _data_->dir; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp49_ = NULL; -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp49_ = _data_->self->priv->cancellable; + _data_->_tmp48_ = _data_->self->priv->cancellable; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 2; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_enumerate_children_async (_data_->_tmp48_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp49_, directory_monitor_explore_async_ready, _data_); + g_file_enumerate_children_async (_data_->_tmp47_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp48_, directory_monitor_explore_async_ready, _data_); #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4068 "DirectoryMonitor.c" +#line 3865 "DirectoryMonitor.c" _state_2: #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp50_ = NULL; -#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp50_ = g_file_enumerate_children_finish (_data_->_tmp48_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp49_ = g_file_enumerate_children_finish (_data_->_tmp47_, _data_->_res_, &_data_->_inner_error_); #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->enumerator = _data_->_tmp50_; + _data_->enumerator = _data_->_tmp49_; #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 4078 "DirectoryMonitor.c" - goto __catch481_g_error; +#line 3873 "DirectoryMonitor.c" + goto __catch482_g_error; } { #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp51_ = TRUE; + _data_->_tmp50_ = TRUE; #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp51_) { -#line 4088 "DirectoryMonitor.c" + if (!_data_->_tmp50_) { +#line 3883 "DirectoryMonitor.c" } #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp51_ = FALSE; -#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp52_ = NULL; -#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp52_ = _data_->enumerator; + _data_->_tmp50_ = FALSE; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp51_ = _data_->enumerator; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp53_ = _data_->self->priv->cancellable; + _data_->_tmp52_ = _data_->self->priv->cancellable; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 3; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_enumerator_next_files_async (_data_->_tmp52_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp53_, directory_monitor_explore_async_ready, _data_); + g_file_enumerator_next_files_async (_data_->_tmp51_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp52_, directory_monitor_explore_async_ready, _data_); #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4106 "DirectoryMonitor.c" +#line 3897 "DirectoryMonitor.c" _state_3: #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp54_ = NULL; -#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp54_ = g_file_enumerator_next_files_finish (_data_->_tmp52_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp53_ = g_file_enumerator_next_files_finish (_data_->_tmp51_, _data_->_res_, &_data_->_inner_error_); #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->infos = _data_->_tmp54_; + _data_->infos = _data_->_tmp53_; #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->enumerator); -#line 4118 "DirectoryMonitor.c" - goto __catch481_g_error; +#line 3907 "DirectoryMonitor.c" + goto __catch482_g_error; } #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp54_ = _data_->infos; #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp55_ = _data_->infos; -#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp55_ == NULL) { + if (_data_->_tmp54_ == NULL) { #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" __g_list_free__g_object_unref0_0 (_data_->infos); #line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4131 "DirectoryMonitor.c" +#line 3918 "DirectoryMonitor.c" } #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp56_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp56_ = _data_->infos; -#line 4137 "DirectoryMonitor.c" + _data_->_tmp55_ = _data_->infos; +#line 3922 "DirectoryMonitor.c" { #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->info_collection = _data_->_tmp56_; + _data_->info_collection = _data_->_tmp55_; #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" for (_data_->info_it = _data_->info_collection; _data_->info_it != NULL; _data_->info_it = _data_->info_it->next) { #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp56_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data); #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp57_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data); -#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->info = _data_->_tmp57_; -#line 4149 "DirectoryMonitor.c" + _data_->info = _data_->_tmp56_; +#line 3932 "DirectoryMonitor.c" { #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp58_ = NULL; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp58_ = _data_->info; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = NULL; -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp59_ = get_file_info_id (_data_->_tmp58_); + _data_->_tmp57_ = _data_->info; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp58_ = get_file_info_id (_data_->_tmp57_); #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp60_ = _data_->_tmp59_; + _data_->_tmp59_ = _data_->_tmp58_; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = FALSE; + _data_->_tmp60_ = _data_->_tmp59_ == NULL; #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp61_ = _data_->_tmp60_ == NULL; + _g_free0 (_data_->_tmp59_); #line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp60_); -#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp61_) { -#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = NULL; -#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp62_ = _data_->info; -#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = NULL; -#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp63_ = _data_->dir; + if (_data_->_tmp60_) { #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp61_ = _data_->info; #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp64_ = g_file_get_uri (_data_->_tmp63_); + _data_->_tmp62_ = _data_->dir; #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp63_ = g_file_get_uri (_data_->_tmp62_); #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp65_ = _data_->_tmp64_; + _data_->_tmp64_ = _data_->_tmp63_; #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_file_info_set_attribute_string (_data_->_tmp62_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp65_); + g_file_info_set_attribute_string (_data_->_tmp61_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp64_); #line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp65_); -#line 4191 "DirectoryMonitor.c" + _g_free0 (_data_->_tmp64_); +#line 3958 "DirectoryMonitor.c" } #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = NULL; + _data_->_tmp65_ = _data_->info; #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp66_ = _data_->info; + _data_->_tmp66_ = g_file_info_get_is_hidden (_data_->_tmp65_); #line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = FALSE; -#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp67_ = g_file_info_get_is_hidden (_data_->_tmp66_); -#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp67_) { -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = NULL; -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp68_ = _data_->dir; -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = NULL; + if (_data_->_tmp66_) { #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp69_ = _data_->info; + _data_->_tmp67_ = _data_->dir; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = NULL; + _data_->_tmp68_ = _data_->info; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp70_ = g_file_info_get_name (_data_->_tmp69_); + _data_->_tmp69_ = g_file_info_get_name (_data_->_tmp68_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = NULL; + _data_->_tmp70_ = g_file_get_child (_data_->_tmp67_, _data_->_tmp69_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp71_ = g_file_get_child (_data_->_tmp68_, _data_->_tmp70_); + _data_->_tmp71_ = _data_->_tmp70_; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = NULL; + _data_->_tmp72_ = g_file_get_path (_data_->_tmp71_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = _data_->_tmp71_; + _data_->_tmp73_ = _data_->_tmp72_; #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = NULL; + g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp73_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp73_ = g_file_get_path (_data_->_tmp72_); + _g_free0 (_data_->_tmp73_); #line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp74_ = NULL; -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp74_ = _data_->_tmp73_; -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp74_); -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp74_); -#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp72_); + _g_object_unref0 (_data_->_tmp71_); #line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); #line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 4241 "DirectoryMonitor.c" +#line 3990 "DirectoryMonitor.c" } #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp75_ = NULL; -#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp75_ = _data_->info; + _data_->_tmp74_ = _data_->info; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp76_ = FALSE; + _data_->_tmp75_ = directory_monitor_is_file_symlink_supported (_data_->_tmp74_); #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp76_ = directory_monitor_is_file_symlink_supported (_data_->_tmp75_); -#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp76_) { + if (!_data_->_tmp75_) { #line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); #line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 4257 "DirectoryMonitor.c" +#line 4002 "DirectoryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp77_ = NULL; -#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp77_ = _data_->info; -#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp78_ = 0; + _data_->_tmp76_ = _data_->info; #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp78_ = g_file_info_get_file_type (_data_->_tmp77_); + _data_->_tmp77_ = g_file_info_get_file_type (_data_->_tmp76_); #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - switch (_data_->_tmp78_) { + switch (_data_->_tmp77_) { #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_REGULAR: -#line 4271 "DirectoryMonitor.c" +#line 4012 "DirectoryMonitor.c" { #line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp79_ = NULL; + _data_->_tmp78_ = _data_->file_map; #line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp79_ = _data_->file_map; -#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp79_ == NULL) { -#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp80_ = NULL; + if (_data_->_tmp78_ == NULL) { #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp80_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp79_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); #line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->file_map = _data_->_tmp80_; -#line 4287 "DirectoryMonitor.c" + _data_->file_map = _data_->_tmp79_; +#line 4024 "DirectoryMonitor.c" } #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = NULL; -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = _data_->file_map; -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp82_ = NULL; -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp82_ = _data_->dir; -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp83_ = NULL; -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp83_ = _data_->info; + _data_->_tmp80_ = _data_->file_map; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp84_ = NULL; + _data_->_tmp81_ = _data_->dir; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp84_ = g_file_info_get_name (_data_->_tmp83_); + _data_->_tmp82_ = _data_->info; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp85_ = NULL; + _data_->_tmp83_ = g_file_info_get_name (_data_->_tmp82_); #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp85_ = g_file_get_child (_data_->_tmp82_, _data_->_tmp84_); + _data_->_tmp84_ = g_file_get_child (_data_->_tmp81_, _data_->_tmp83_); #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp86_ = NULL; + _data_->_tmp85_ = _data_->_tmp84_; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp86_ = _data_->_tmp85_; + _data_->_tmp86_ = _data_->info; #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp87_ = NULL; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp80_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp85_, _data_->_tmp86_); #line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp87_ = _data_->info; -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp81_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp86_, _data_->_tmp87_); -#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp86_); + _g_object_unref0 (_data_->_tmp85_); #line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4323 "DirectoryMonitor.c" +#line 4046 "DirectoryMonitor.c" } #line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_TYPE_DIRECTORY: -#line 4327 "DirectoryMonitor.c" +#line 4050 "DirectoryMonitor.c" { #line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp88_ = NULL; + _data_->_tmp87_ = _data_->dir_map; #line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp88_ = _data_->dir_map; -#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp88_ == NULL) { -#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp89_ = NULL; + if (_data_->_tmp87_ == NULL) { #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp89_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp88_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); #line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->dir_map = _data_->_tmp89_; -#line 4343 "DirectoryMonitor.c" + _data_->dir_map = _data_->_tmp88_; +#line 4062 "DirectoryMonitor.c" } #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp90_ = NULL; -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp90_ = _data_->dir_map; -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp91_ = NULL; -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp91_ = _data_->dir; -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp92_ = NULL; -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp92_ = _data_->info; -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp93_ = NULL; + _data_->_tmp89_ = _data_->dir_map; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp93_ = g_file_info_get_name (_data_->_tmp92_); + _data_->_tmp90_ = _data_->dir; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp94_ = NULL; + _data_->_tmp91_ = _data_->info; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp94_ = g_file_get_child (_data_->_tmp91_, _data_->_tmp93_); + _data_->_tmp92_ = g_file_info_get_name (_data_->_tmp91_); #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp95_ = NULL; + _data_->_tmp93_ = g_file_get_child (_data_->_tmp90_, _data_->_tmp92_); #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp95_ = _data_->_tmp94_; + _data_->_tmp94_ = _data_->_tmp93_; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp96_ = NULL; + _data_->_tmp95_ = _data_->info; #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp96_ = _data_->info; + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp89_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp94_, _data_->_tmp95_); #line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp90_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp95_, _data_->_tmp96_); -#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp95_); + _g_object_unref0 (_data_->_tmp94_); #line 945 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4379 "DirectoryMonitor.c" +#line 4084 "DirectoryMonitor.c" } default: { #line 949 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4385 "DirectoryMonitor.c" +#line 4090 "DirectoryMonitor.c" } } #line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->info); -#line 4390 "DirectoryMonitor.c" +#line 4095 "DirectoryMonitor.c" } } } #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" __g_list_free__g_object_unref0_0 (_data_->infos); -#line 4396 "DirectoryMonitor.c" +#line 4101 "DirectoryMonitor.c" } } #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->enumerator); -#line 4401 "DirectoryMonitor.c" +#line 4106 "DirectoryMonitor.c" } - goto __finally481; - __catch481_g_error: + goto __finally482; + __catch482_g_error: { #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->err2 = _data_->_inner_error_; #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_inner_error_ = NULL; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp97_ = NULL; -#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp97_ = _data_->dir; -#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp98_ = NULL; -#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp98_ = g_file_get_path (_data_->_tmp97_); -#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp99_ = NULL; -#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp99_ = _data_->_tmp98_; + _data_->_tmp96_ = _data_->dir; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp100_ = NULL; + _data_->_tmp97_ = g_file_get_path (_data_->_tmp96_); #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp100_ = _data_->err2; + _data_->_tmp98_ = _data_->_tmp97_; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp101_ = NULL; + _data_->_tmp99_ = _data_->err2; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp101_ = _data_->_tmp100_->message; + _data_->_tmp100_ = _data_->_tmp99_->message; #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp99_, _data_->_tmp101_); + g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp98_, _data_->_tmp100_); #line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_free0 (_data_->_tmp99_); + _g_free0 (_data_->_tmp98_); #line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp102_ = FALSE; + _data_->_tmp101_ = _data_->in_discovery; #line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp102_ = _data_->in_discovery; -#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp102_); + directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp101_); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (_data_->err2); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4449,22 +4142,23 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4452 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { +#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + while (_data_->_task_complete_ != TRUE) { #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 4456 "DirectoryMonitor.c" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 4149 "DirectoryMonitor.c" + } } #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4462 "DirectoryMonitor.c" +#line 4156 "DirectoryMonitor.c" } - __finally481: + __finally482: #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4478,246 +4172,174 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_clear_error (&_data_->_inner_error_); #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_object_unref (_data_->_async_result); +#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4479 "DirectoryMonitor.c" +#line 4175 "DirectoryMonitor.c" } #line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp103_ = FALSE; -#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp103_ = _data_->in_discovery; + _data_->_tmp102_ = _data_->in_discovery; #line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp103_) { + if (_data_->_tmp102_) { #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp104_ = NULL; + _data_->_tmp103_ = _data_->dir; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp104_ = _data_->dir; + _data_->_tmp104_ = _data_->local_dir_info; #line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp105_ = NULL; -#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp105_ = _data_->local_dir_info; -#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp104_, _data_->_tmp105_); -#line 4497 "DirectoryMonitor.c" + directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp103_, _data_->_tmp104_); +#line 4187 "DirectoryMonitor.c" } else { #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp106_ = NULL; -#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp106_ = _data_->dir; + _data_->_tmp105_ = _data_->dir; #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp107_ = NULL; + _data_->_tmp106_ = _data_->local_dir_info; #line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp107_ = _data_->local_dir_info; -#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp106_, _data_->_tmp107_); -#line 4509 "DirectoryMonitor.c" + directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp105_, _data_->_tmp106_); +#line 4195 "DirectoryMonitor.c" } #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp108_ = NULL; -#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp108_ = _data_->dir; + _data_->_tmp107_ = _data_->dir; #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp109_ = NULL; + _data_->_tmp108_ = _data_->local_dir_info; #line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp109_ = _data_->local_dir_info; -#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_add_monitor (_data_->self, _data_->_tmp108_, _data_->_tmp109_); -#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp110_ = NULL; + directory_monitor_add_monitor (_data_->self, _data_->_tmp107_, _data_->_tmp108_); #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp110_ = _data_->file_map; + _data_->_tmp109_ = _data_->file_map; #line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp110_ != NULL) { -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp111_ = NULL; + if (_data_->_tmp109_ != NULL) { #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp111_ = _data_->file_map; -#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp112_ = FALSE; + _data_->_tmp110_ = _data_->file_map; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp112_ = _data_->in_discovery; + _data_->_tmp111_ = _data_->in_discovery; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 4; #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp111_, GEE_TYPE_MAP, GeeMap), _data_->_tmp112_, directory_monitor_explore_async_ready, _data_); + directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp110_, GEE_TYPE_MAP, GeeMap), _data_->_tmp111_, directory_monitor_explore_async_ready, _data_); #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4541 "DirectoryMonitor.c" +#line 4217 "DirectoryMonitor.c" _state_4: #line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_); -#line 4545 "DirectoryMonitor.c" +#line 4221 "DirectoryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp114_ = FALSE; + _data_->_tmp113_ = _data_->self->priv->recurse; #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp114_ = _data_->self->priv->recurse; -#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp114_) { -#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp115_ = NULL; + if (_data_->_tmp113_) { #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp115_ = _data_->dir_map; + _data_->_tmp114_ = _data_->dir_map; #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp113_ = _data_->_tmp115_ != NULL; -#line 4559 "DirectoryMonitor.c" + _data_->_tmp112_ = _data_->_tmp114_ != NULL; +#line 4231 "DirectoryMonitor.c" } else { #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp113_ = FALSE; -#line 4563 "DirectoryMonitor.c" + _data_->_tmp112_ = FALSE; +#line 4235 "DirectoryMonitor.c" } #line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp113_) { -#line 4567 "DirectoryMonitor.c" + if (_data_->_tmp112_) { +#line 4239 "DirectoryMonitor.c" { #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp116_ = NULL; + _data_->_tmp115_ = _data_->dir_map; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp116_ = _data_->dir_map; + _data_->_tmp116_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp117_ = NULL; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp117_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp116_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp118_ = NULL; + _data_->_tmp117_ = _data_->_tmp116_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp118_ = _data_->_tmp117_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp119_ = NULL; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp119_ = _data_->_tmp118_; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp120_ = NULL; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp120_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_ITERABLE, GeeIterable)); + _data_->_tmp119_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp118_, GEE_TYPE_ITERABLE, GeeIterable)); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp121_ = NULL; + _data_->_tmp120_ = _data_->_tmp119_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp121_ = _data_->_tmp120_; + _g_object_unref0 (_data_->_tmp118_); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp119_); -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_subdir_it = _data_->_tmp121_; + _data_->_subdir_it = _data_->_tmp120_; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp122_ = NULL; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp122_ = _data_->_subdir_it; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp123_ = FALSE; + _data_->_tmp121_ = _data_->_subdir_it; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp123_ = gee_iterator_next (_data_->_tmp122_); + _data_->_tmp122_ = gee_iterator_next (_data_->_tmp121_); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (!_data_->_tmp123_) { + if (!_data_->_tmp122_) { #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4611 "DirectoryMonitor.c" +#line 4267 "DirectoryMonitor.c" } #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp124_ = NULL; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp124_ = _data_->_subdir_it; -#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp125_ = NULL; + _data_->_tmp123_ = _data_->_subdir_it; #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp125_ = gee_iterator_get (_data_->_tmp124_); + _data_->_tmp124_ = gee_iterator_get (_data_->_tmp123_); #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->subdir = (GFile*) _data_->_tmp125_; + _data_->subdir = (GFile*) _data_->_tmp124_; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp126_ = 0; + _data_->_tmp125_ = _data_->self->priv->outstanding_exploration_dirs; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs; -#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp126_ + 1; -#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp127_ = 0; + _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp125_ + 1; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp127_ = _data_->self->priv->outstanding_exploration_dirs; + _data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs; #line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_tmp127_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) { -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp128_ = NULL; + if (_data_->_tmp126_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) { #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp128_ = _data_->subdir; + _data_->_tmp127_ = _data_->subdir; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp129_ = NULL; + _data_->_tmp128_ = _data_->dir_map; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp129_ = _data_->dir_map; + _data_->_tmp129_ = _data_->subdir; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp130_ = NULL; + _data_->_tmp130_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp128_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp129_); #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp130_ = _data_->subdir; + _data_->_tmp131_ = (GFileInfo*) _data_->_tmp130_; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp131_ = NULL; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp131_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp129_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp130_); -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp132_ = NULL; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp132_ = (GFileInfo*) _data_->_tmp131_; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp133_ = FALSE; -#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp133_ = _data_->in_discovery; + _data_->_tmp132_ = _data_->in_discovery; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_state_ = 5; #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (_data_->self, _data_->_tmp128_, _data_->_tmp132_, _data_->_tmp133_, directory_monitor_explore_async_ready, _data_); + directory_monitor_explore_async (_data_->self, _data_->_tmp127_, _data_->_tmp131_, _data_->_tmp132_, directory_monitor_explore_async_ready, _data_); #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4665 "DirectoryMonitor.c" +#line 4301 "DirectoryMonitor.c" _state_5: #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_explore_finish (_data_->self, _data_->_res_); #line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp132_); -#line 4671 "DirectoryMonitor.c" + _g_object_unref0 (_data_->_tmp131_); +#line 4307 "DirectoryMonitor.c" } else { #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp134_ = NULL; -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp134_ = _data_->subdir; -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp135_ = NULL; -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp135_ = _data_->dir_map; -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp136_ = NULL; -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp136_ = _data_->subdir; + _data_->_tmp133_ = _data_->subdir; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp137_ = NULL; + _data_->_tmp134_ = _data_->dir_map; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp137_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp135_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp136_); + _data_->_tmp135_ = _data_->subdir; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp138_ = NULL; + _data_->_tmp136_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp134_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp135_); #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp138_ = (GFileInfo*) _data_->_tmp137_; + _data_->_tmp137_ = (GFileInfo*) _data_->_tmp136_; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp139_ = FALSE; + _data_->_tmp138_ = _data_->in_discovery; #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp139_ = _data_->in_discovery; + directory_monitor_explore_async (_data_->self, _data_->_tmp133_, _data_->_tmp137_, _data_->_tmp138_, NULL, NULL); #line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_async (_data_->self, _data_->_tmp134_, _data_->_tmp138_, _data_->_tmp139_, NULL, NULL); -#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _g_object_unref0 (_data_->_tmp138_); -#line 4701 "DirectoryMonitor.c" + _g_object_unref0 (_data_->_tmp137_); +#line 4325 "DirectoryMonitor.c" } #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->subdir); -#line 4705 "DirectoryMonitor.c" +#line 4329 "DirectoryMonitor.c" } #line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_subdir_it); -#line 4709 "DirectoryMonitor.c" +#line 4333 "DirectoryMonitor.c" } } #line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp140_ = FALSE; -#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp140_ = _data_->in_discovery; + _data_->_tmp139_ = _data_->in_discovery; #line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp140_); + directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp139_); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4725,20 +4347,21 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->local_dir_info); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4728 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 4732 "DirectoryMonitor.c" + while (_data_->_task_complete_ != TRUE) { +#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 4354 "DirectoryMonitor.c" + } } #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4738 "DirectoryMonitor.c" +#line 4361 "DirectoryMonitor.c" } @@ -4751,22 +4374,46 @@ static void directory_monitor_notify_directory_files_data_free (gpointer _data) _g_object_unref0 (_data_->self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_slice_free (DirectoryMonitorNotifyDirectoryFilesData, _data_); -#line 4751 "DirectoryMonitor.c" +#line 4374 "DirectoryMonitor.c" +} + + +static void directory_monitor_notify_directory_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) { + DirectoryMonitorNotifyDirectoryFilesData* _task_data_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_ = g_task_get_task_data (G_TASK (res)); +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + if (_task_data_->_callback_ != NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_callback_ (source_object, res, user_data); +#line 4386 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _task_data_->_task_complete_ = TRUE; +#line 4390 "DirectoryMonitor.c" } static void directory_monitor_notify_directory_files (DirectoryMonitor* self, GeeMap* map, gboolean in_discovery, GAsyncReadyCallback _callback_, gpointer _user_data_) { DirectoryMonitorNotifyDirectoryFilesData* _data_; - DirectoryMonitor* _tmp0_ = NULL; - GeeMap* _tmp1_ = NULL; - GeeMap* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + DirectoryMonitor* _tmp0_; + GeeMap* _tmp1_; + GeeMap* _tmp2_; + gboolean _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_ = g_slice_new0 (DirectoryMonitorNotifyDirectoryFilesData); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, directory_monitor_notify_directory_files); + _data_->_callback_ = _callback_; +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_async_result = g_task_new (G_OBJECT (self), NULL, directory_monitor_notify_directory_files_async_ready_wrapper, _user_data_); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, directory_monitor_notify_directory_files_data_free); + if (_callback_ == NULL) { +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + _data_->_task_complete_ = TRUE; +#line 4410 "DirectoryMonitor.c" + } +#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_task_set_task_data (_data_->_async_result, _data_, directory_monitor_notify_directory_files_data_free); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _g_object_ref0 (self); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4785,15 +4432,15 @@ static void directory_monitor_notify_directory_files (DirectoryMonitor* self, Ge _data_->in_discovery = _tmp3_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_files_co (_data_); -#line 4785 "DirectoryMonitor.c" +#line 4432 "DirectoryMonitor.c" } static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* self, GAsyncResult* _res_) { DirectoryMonitorNotifyDirectoryFilesData* _data_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 4793 "DirectoryMonitor.c" + _data_ = g_task_propagate_pointer (G_TASK (_res_), NULL); +#line 4440 "DirectoryMonitor.c" } @@ -4802,7 +4449,7 @@ static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpoin result = directory_monitor_notify_directory_files_co (self); #line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 4802 "DirectoryMonitor.c" +#line 4449 "DirectoryMonitor.c" } @@ -4811,73 +4458,51 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot switch (_data_->_state_) { #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 0: -#line 4811 "DirectoryMonitor.c" +#line 4458 "DirectoryMonitor.c" goto _state_0; #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case 1: -#line 4815 "DirectoryMonitor.c" +#line 4462 "DirectoryMonitor.c" goto _state_1; default: #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_assert_not_reached (); -#line 4820 "DirectoryMonitor.c" +#line 4467 "DirectoryMonitor.c" } _state_0: #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = NULL; -#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = _data_->map; #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = NULL; -#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = gee_map_map_iterator (_data_->_tmp0_); #line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->iter = _data_->_tmp1_; #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp2_ = NULL; -#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp2_ = _data_->iter; #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp3_ = FALSE; -#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp3_ = gee_map_iterator_next (_data_->_tmp2_); #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_data_->_tmp3_) { #line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 4847 "DirectoryMonitor.c" +#line 4486 "DirectoryMonitor.c" } #line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp4_ = FALSE; -#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp4_ = _data_->in_discovery; #line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_data_->_tmp4_) { #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp5_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp5_ = _data_->iter; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp6_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp6_ = gee_map_iterator_get_key (_data_->_tmp5_); #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp7_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp7_ = (GFile*) _data_->_tmp6_; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp8_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp8_ = _data_->iter; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp9_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp9_ = gee_map_iterator_get_value (_data_->_tmp8_); #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp10_ = NULL; -#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp10_ = (GFileInfo*) _data_->_tmp9_; #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_discovered (_data_->self, _data_->_tmp7_, _data_->_tmp10_); @@ -4885,31 +4510,19 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot _g_object_unref0 (_data_->_tmp10_); #line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp7_); -#line 4885 "DirectoryMonitor.c" +#line 4510 "DirectoryMonitor.c" } else { #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp11_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp11_ = _data_->iter; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp12_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp12_ = gee_map_iterator_get_key (_data_->_tmp11_); #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp13_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp13_ = (GFile*) _data_->_tmp12_; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp14_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp14_ = _data_->iter; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp15_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp15_ = gee_map_iterator_get_value (_data_->_tmp14_); #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp16_ = NULL; -#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp16_ = (GFileInfo*) _data_->_tmp15_; #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_created (_data_->self, _data_->_tmp13_, _data_->_tmp16_); @@ -4917,7 +4530,7 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot _g_object_unref0 (_data_->_tmp16_); #line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->_tmp13_); -#line 4917 "DirectoryMonitor.c" +#line 4530 "DirectoryMonitor.c" } #line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_notify_directory_files_co_gsource_func, _data_, NULL); @@ -4925,35 +4538,36 @@ static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNot _data_->_state_ = 1; #line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4925 "DirectoryMonitor.c" +#line 4538 "DirectoryMonitor.c" _state_1: ; } #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->iter); #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - if (_data_->_state_ == 0) { + g_task_return_pointer (_data_->_async_result, _data_, NULL); #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4935 "DirectoryMonitor.c" - } else { + if (_data_->_state_ != 0) { #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 4939 "DirectoryMonitor.c" + while (_data_->_task_complete_ != TRUE) { +#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); +#line 4552 "DirectoryMonitor.c" + } } #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_object_unref (_data_->_async_result); #line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return FALSE; -#line 4945 "DirectoryMonitor.c" +#line 4559 "DirectoryMonitor.c" } static void directory_monitor_explore_directory_completed (DirectoryMonitor* self, gboolean in_discovery) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; #line 1003 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4968,23 +4582,23 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel _tmp3_ = in_discovery; #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp3_) { -#line 4968 "DirectoryMonitor.c" - gint _tmp4_ = 0; +#line 4582 "DirectoryMonitor.c" + gint _tmp4_; #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = self->priv->outstanding_exploration_dirs; #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _tmp4_ == 0; -#line 4974 "DirectoryMonitor.c" +#line 4588 "DirectoryMonitor.c" } else { #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = FALSE; -#line 4978 "DirectoryMonitor.c" +#line 4592 "DirectoryMonitor.c" } #line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_) { #line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_discovery_completed (self); -#line 4984 "DirectoryMonitor.c" +#line 4598 "DirectoryMonitor.c" } } @@ -4992,32 +4606,32 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { #line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_on_monitor_notification ((DirectoryMonitor*) self, file, other_file, event_type); -#line 4992 "DirectoryMonitor.c" +#line 4606 "DirectoryMonitor.c" } static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; gchar* id = NULL; - DirectoryMonitorFileInfoMap* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GeeHashMap* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + DirectoryMonitorFileInfoMap* _tmp1_; + GFile* _tmp2_; + GFileInfo* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + GeeHashMap* _tmp6_; + const gchar* _tmp7_; + gboolean _tmp8_; GFileMonitor* monitor = NULL; - GeeHashMap* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - GFileMonitor* _tmp21_ = NULL; - GFileMonitor* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; + GeeHashMap* _tmp19_; + const gchar* _tmp20_; + GFileMonitor* _tmp21_; + GFileMonitor* _tmp22_; + GFile* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; GError * _inner_error_ = NULL; #line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); @@ -5033,7 +4647,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di result = FALSE; #line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5033 "DirectoryMonitor.c" +#line 4647 "DirectoryMonitor.c" } #line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; @@ -5055,7 +4669,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5055 "DirectoryMonitor.c" +#line 4669 "DirectoryMonitor.c" } #line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = self->priv->monitors; @@ -5071,16 +4685,16 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5071 "DirectoryMonitor.c" +#line 4685 "DirectoryMonitor.c" } #line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" monitor = NULL; -#line 5075 "DirectoryMonitor.c" +#line 4689 "DirectoryMonitor.c" { GFileMonitor* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFileMonitor* _tmp11_ = NULL; - GFileMonitor* _tmp12_ = NULL; + GFile* _tmp10_; + GFileMonitor* _tmp11_; + GFileMonitor* _tmp12_; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = dir; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5089,8 +4703,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _tmp9_ = _tmp11_; #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5089 "DirectoryMonitor.c" - goto __catch482_g_error; +#line 4703 "DirectoryMonitor.c" + goto __catch483_g_error; } #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = _tmp9_; @@ -5102,17 +4716,17 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di monitor = _tmp12_; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp9_); -#line 5102 "DirectoryMonitor.c" +#line 4716 "DirectoryMonitor.c" } - goto __finally482; - __catch482_g_error: + goto __finally483; + __catch483_g_error: { GError* err = NULL; - GFile* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + GFile* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + GError* _tmp16_; + const gchar* _tmp17_; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5141,12 +4755,12 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5141 "DirectoryMonitor.c" +#line 4755 "DirectoryMonitor.c" } - __finally482: + __finally483: #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5146 "DirectoryMonitor.c" +#line 4760 "DirectoryMonitor.c" gboolean _tmp18_ = FALSE; #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (monitor); @@ -5158,7 +4772,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di g_clear_error (&_inner_error_); #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return _tmp18_; -#line 5158 "DirectoryMonitor.c" +#line 4772 "DirectoryMonitor.c" } #line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = self->priv->monitors; @@ -5196,35 +4810,35 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di _g_free0 (id); #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5196 "DirectoryMonitor.c" +#line 4810 "DirectoryMonitor.c" } static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* dir, GFileInfo* info) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; gchar* id = NULL; - DirectoryMonitorFileInfoMap* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + DirectoryMonitorFileInfoMap* _tmp1_; + GFile* _tmp2_; + GFileInfo* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; GFileMonitor* monitor = NULL; - GeeHashMap* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - GFileMonitor* _tmp9_ = NULL; + GeeHashMap* _tmp6_; + const gchar* _tmp7_; + gpointer _tmp8_; + GFileMonitor* _tmp9_; gboolean removed = FALSE; - GeeHashMap* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - GFileMonitor* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + GeeHashMap* _tmp10_; + const gchar* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; + GFileMonitor* _tmp14_; + GFile* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5239,7 +4853,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* result = FALSE; #line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5239 "DirectoryMonitor.c" +#line 4853 "DirectoryMonitor.c" } #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->files; @@ -5261,7 +4875,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5261 "DirectoryMonitor.c" +#line 4875 "DirectoryMonitor.c" } #line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = self->priv->monitors; @@ -5283,7 +4897,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5283 "DirectoryMonitor.c" +#line 4897 "DirectoryMonitor.c" } #line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->priv->monitors; @@ -5325,14 +4939,14 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile* _g_free0 (id); #line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5325 "DirectoryMonitor.c" +#line 4939 "DirectoryMonitor.c" } static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonitor* monitor) { - GFileMonitor* _tmp0_ = NULL; - guint _tmp1_ = 0U; - GFileMonitor* _tmp2_ = NULL; + GFileMonitor* _tmp0_; + guint _tmp1_; + GFileMonitor* _tmp2_; #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5347,7 +4961,7 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit _tmp2_ = monitor; #line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_monitor_cancel (_tmp2_); -#line 5347 "DirectoryMonitor.c" +#line 4961 "DirectoryMonitor.c" } @@ -5356,7 +4970,7 @@ static void _directory_monitor_query_info_queue_element_on_completed_gasync_read directory_monitor_query_info_queue_element_on_completed ((DirectoryMonitorQueryInfoQueueElement*) self, source_object, res); #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (self); -#line 5356 "DirectoryMonitor.c" +#line 4970 "DirectoryMonitor.c" } @@ -5365,28 +4979,28 @@ static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self); #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 5365 "DirectoryMonitor.c" +#line 4979 "DirectoryMonitor.c" } static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileMonitorEvent event) { gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileMonitorEvent _tmp5_ = 0; + GFile* _tmp1_; + GFileMonitorEvent _tmp5_; GEnumValue* _tmp6_; - GFile* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + GFile* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; DirectoryMonitorQueryInfoQueueElement* query_info = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFileMonitorEvent _tmp14_ = 0; - DirectoryMonitorQueryInfoQueueElement* _tmp15_ = NULL; - GeeQueue* _tmp16_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp17_ = NULL; - GFileMonitorEvent _tmp18_ = 0; + GFile* _tmp12_; + GFile* _tmp13_; + GFileMonitorEvent _tmp14_; + DirectoryMonitorQueryInfoQueueElement* _tmp15_; + GeeQueue* _tmp16_; + DirectoryMonitorQueryInfoQueueElement* _tmp17_; + GFileMonitorEvent _tmp18_; #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5397,9 +5011,9 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _tmp1_ = other_file; #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_ != NULL) { -#line 5397 "DirectoryMonitor.c" - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; +#line 5011 "DirectoryMonitor.c" + GFile* _tmp2_; + gchar* _tmp3_; #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = other_file; #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5408,16 +5022,16 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _g_free0 (_tmp0_); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp3_; -#line 5408 "DirectoryMonitor.c" +#line 5022 "DirectoryMonitor.c" } else { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_strdup ("(none)"); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); #line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp4_; -#line 5417 "DirectoryMonitor.c" +#line 5031 "DirectoryMonitor.c" } #line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = event; @@ -5463,11 +5077,11 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G case G_FILE_MONITOR_EVENT_CREATED: #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 5463 "DirectoryMonitor.c" +#line 5077 "DirectoryMonitor.c" { - GFile* _tmp19_ = NULL; - GCancellable* _tmp20_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp21_ = NULL; + GFile* _tmp19_; + GCancellable* _tmp20_; + DirectoryMonitorQueryInfoQueueElement* _tmp21_; #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = file; #line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5478,42 +5092,42 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G g_file_query_info_async (_tmp19_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp20_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp21_)); #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5478 "DirectoryMonitor.c" +#line 5092 "DirectoryMonitor.c" } #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 5482 "DirectoryMonitor.c" +#line 5096 "DirectoryMonitor.c" { - guint _tmp22_ = 0U; + guint _tmp22_; #line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = self->priv->delete_timer_id; #line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp22_ == ((guint) 0)) { -#line 5489 "DirectoryMonitor.c" - guint _tmp23_ = 0U; +#line 5103 "DirectoryMonitor.c" + guint _tmp23_; #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref); #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = _tmp23_; -#line 5495 "DirectoryMonitor.c" +#line 5109 "DirectoryMonitor.c" } #line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5499 "DirectoryMonitor.c" +#line 5113 "DirectoryMonitor.c" } #line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 5503 "DirectoryMonitor.c" +#line 5117 "DirectoryMonitor.c" { - GFile* _tmp24_ = NULL; + GFile* _tmp24_; #line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = other_file; #line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp24_ != NULL) { -#line 5510 "DirectoryMonitor.c" - GFile* _tmp25_ = NULL; - GCancellable* _tmp26_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp27_ = NULL; +#line 5124 "DirectoryMonitor.c" + GFile* _tmp25_; + GCancellable* _tmp26_; + DirectoryMonitorQueryInfoQueueElement* _tmp27_; #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = other_file; #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5522,10 +5136,10 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _tmp27_ = query_info; #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_file_query_info_async (_tmp25_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp26_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp27_)); -#line 5522 "DirectoryMonitor.c" +#line 5136 "DirectoryMonitor.c" } else { - GeeQueue* _tmp28_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp29_ = NULL; + GeeQueue* _tmp28_; + DirectoryMonitorQueryInfoQueueElement* _tmp29_; #line 1107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_warning ("DirectoryMonitor.vala:1107: Unable to process MOVED event: no other_fi" \ "le"); @@ -5535,16 +5149,16 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G _tmp29_ = query_info; #line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_); -#line 5534 "DirectoryMonitor.c" +#line 5148 "DirectoryMonitor.c" } #line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5538 "DirectoryMonitor.c" +#line 5152 "DirectoryMonitor.c" } default: { - DirectoryMonitorQueryInfoQueueElement* _tmp30_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp31_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp30_; + DirectoryMonitorQueryInfoQueueElement* _tmp31_; #line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = query_info; #line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5555,21 +5169,21 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G directory_monitor_process_query_queue (self, _tmp31_); #line 1116 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5554 "DirectoryMonitor.c" +#line 5168 "DirectoryMonitor.c" } } #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (query_info); #line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 5561 "DirectoryMonitor.c" +#line 5175 "DirectoryMonitor.c" } static void directory_monitor_process_query_queue (DirectoryMonitor* self, DirectoryMonitorQueryInfoQueueElement* query_info) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp2_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp2_; #line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5578,47 +5192,47 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp2_ = query_info; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ != NULL) { -#line 5577 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp3_ = NULL; - GFileInfo* _tmp4_ = NULL; +#line 5191 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp3_; + GFileInfo* _tmp4_; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = query_info; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _tmp3_->info; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = _tmp4_ != NULL; -#line 5586 "DirectoryMonitor.c" +#line 5200 "DirectoryMonitor.c" } else { #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = FALSE; -#line 5590 "DirectoryMonitor.c" +#line 5204 "DirectoryMonitor.c" } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_) { -#line 5594 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp5_ = NULL; - GFileMonitorEvent _tmp6_ = 0; +#line 5208 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp5_; + GFileMonitorEvent _tmp6_; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = query_info; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _tmp5_->event; #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED; -#line 5603 "DirectoryMonitor.c" +#line 5217 "DirectoryMonitor.c" } else { #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = FALSE; -#line 5607 "DirectoryMonitor.c" +#line 5221 "DirectoryMonitor.c" } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_) { -#line 5611 "DirectoryMonitor.c" +#line 5225 "DirectoryMonitor.c" GFile* match = NULL; - DirectoryMonitorFileInfoMap* _tmp7_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp8_ = NULL; - GFileInfo* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; + DirectoryMonitorFileInfoMap* _tmp7_; + DirectoryMonitorQueryInfoQueueElement* _tmp8_; + GFileInfo* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->files; #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5633,16 +5247,16 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp11_ = match; #line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp11_ != NULL) { -#line 5632 "DirectoryMonitor.c" +#line 5246 "DirectoryMonitor.c" gboolean matched = FALSE; - gboolean _tmp48_ = FALSE; + gboolean _tmp48_; #line 1128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" matched = FALSE; -#line 5637 "DirectoryMonitor.c" +#line 5251 "DirectoryMonitor.c" { GeeIterator* _enqueued_it = NULL; - GeeQueue* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; + GeeQueue* _tmp12_; + GeeIterator* _tmp13_; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = self->priv->query_info_queue; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5651,36 +5265,36 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _enqueued_it = _tmp13_; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5650 "DirectoryMonitor.c" - GeeIterator* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; +#line 5264 "DirectoryMonitor.c" + GeeIterator* _tmp14_; + gboolean _tmp15_; DirectoryMonitorQueryInfoQueueElement* enqueued = NULL; - GeeIterator* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; + GeeIterator* _tmp16_; + gpointer _tmp17_; gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp20_ = NULL; - GFileMonitorEvent _tmp21_ = 0; - DirectoryMonitorQueryInfoQueueElement* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp32_ = NULL; - GFile* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp38_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp39_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp40_ = NULL; - GFile* _tmp41_ = NULL; - GFile* _tmp42_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp43_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp44_ = NULL; - GFileInfo* _tmp45_ = NULL; - GFileInfo* _tmp46_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp47_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp20_; + GFileMonitorEvent _tmp21_; + DirectoryMonitorQueryInfoQueueElement* _tmp28_; + GFile* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + DirectoryMonitorQueryInfoQueueElement* _tmp32_; + GFile* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + DirectoryMonitorQueryInfoQueueElement* _tmp38_; + DirectoryMonitorQueryInfoQueueElement* _tmp39_; + DirectoryMonitorQueryInfoQueueElement* _tmp40_; + GFile* _tmp41_; + GFile* _tmp42_; + DirectoryMonitorQueryInfoQueueElement* _tmp43_; + DirectoryMonitorQueryInfoQueueElement* _tmp44_; + GFileInfo* _tmp45_; + GFileInfo* _tmp46_; + DirectoryMonitorQueryInfoQueueElement* _tmp47_; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = _enqueued_it; #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5689,7 +5303,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc if (!_tmp15_) { #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5688 "DirectoryMonitor.c" +#line 5302 "DirectoryMonitor.c" } #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = _enqueued_it; @@ -5705,28 +5319,28 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) { #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = TRUE; -#line 5704 "DirectoryMonitor.c" +#line 5318 "DirectoryMonitor.c" } else { - DirectoryMonitorQueryInfoQueueElement* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + DirectoryMonitorQueryInfoQueueElement* _tmp22_; + gboolean _tmp23_; #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = enqueued; #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = _tmp22_->completed; #line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _tmp23_; -#line 5714 "DirectoryMonitor.c" +#line 5328 "DirectoryMonitor.c" } #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp19_) { #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = TRUE; -#line 5720 "DirectoryMonitor.c" +#line 5334 "DirectoryMonitor.c" } else { - GFile* _tmp24_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp25_ = NULL; - GFile* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; + GFile* _tmp24_; + DirectoryMonitorQueryInfoQueueElement* _tmp25_; + GFile* _tmp26_; + gboolean _tmp27_; #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = match; #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -5737,7 +5351,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp27_ = g_file_equal (_tmp24_, _tmp26_); #line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = !_tmp27_; -#line 5736 "DirectoryMonitor.c" +#line 5350 "DirectoryMonitor.c" } #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp18_) { @@ -5745,7 +5359,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (enqueued); #line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 5744 "DirectoryMonitor.c" +#line 5358 "DirectoryMonitor.c" } #line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = query_info; @@ -5813,31 +5427,31 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (enqueued); #line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5812 "DirectoryMonitor.c" +#line 5426 "DirectoryMonitor.c" } #line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_enqueued_it); -#line 5816 "DirectoryMonitor.c" +#line 5430 "DirectoryMonitor.c" } #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp48_ = matched; #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp48_) { -#line 5822 "DirectoryMonitor.c" - GeeQueue* _tmp49_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp50_ = NULL; +#line 5436 "DirectoryMonitor.c" + GeeQueue* _tmp49_; + DirectoryMonitorQueryInfoQueueElement* _tmp50_; #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp49_ = self->priv->query_info_queue; #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp50_ = query_info; #line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); -#line 5831 "DirectoryMonitor.c" +#line 5445 "DirectoryMonitor.c" } } #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (match); -#line 5836 "DirectoryMonitor.c" +#line 5450 "DirectoryMonitor.c" } { gboolean _tmp51_ = FALSE; @@ -5845,47 +5459,47 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp51_ = TRUE; #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 5844 "DirectoryMonitor.c" +#line 5458 "DirectoryMonitor.c" DirectoryMonitorQueryInfoQueueElement* next = NULL; - GeeQueue* _tmp52_ = NULL; - gpointer _tmp53_ = NULL; + GeeQueue* _tmp52_; + gpointer _tmp53_; gboolean _tmp54_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp55_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp55_; DirectoryMonitorQueryInfoQueueElement* n = NULL; - GeeQueue* _tmp58_ = NULL; - gpointer _tmp59_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp60_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp61_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp62_ = NULL; - guint _tmp63_ = 0U; - DirectoryMonitorQueryInfoQueueElement* _tmp64_ = NULL; - GFileMonitorEvent _tmp65_ = 0; + GeeQueue* _tmp58_; + gpointer _tmp59_; + DirectoryMonitorQueryInfoQueueElement* _tmp60_; + DirectoryMonitorQueryInfoQueueElement* _tmp61_; + DirectoryMonitorQueryInfoQueueElement* _tmp62_; + guint _tmp63_; + DirectoryMonitorQueryInfoQueueElement* _tmp64_; + GFileMonitorEvent _tmp65_; GEnumValue* _tmp66_; - DirectoryMonitorQueryInfoQueueElement* _tmp67_ = NULL; - GFile* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp73_ = NULL; - GError* _tmp74_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp67_; + GFile* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; + DirectoryMonitorQueryInfoQueueElement* _tmp73_; + GError* _tmp74_; gboolean _tmp87_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp88_ = NULL; - GFileInfo* _tmp89_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp88_; + GFileInfo* _tmp89_; gboolean _tmp103_ = FALSE; - DirectoryMonitorQueryInfoQueueElement* _tmp104_ = NULL; - GFileInfo* _tmp105_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp118_ = NULL; - GFile* _tmp119_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp120_ = NULL; - GFile* _tmp121_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp122_ = NULL; - GFileInfo* _tmp123_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp124_ = NULL; - GFileMonitorEvent _tmp125_ = 0; + DirectoryMonitorQueryInfoQueueElement* _tmp104_; + GFileInfo* _tmp105_; + DirectoryMonitorQueryInfoQueueElement* _tmp118_; + GFile* _tmp119_; + DirectoryMonitorQueryInfoQueueElement* _tmp120_; + GFile* _tmp121_; + DirectoryMonitorQueryInfoQueueElement* _tmp122_; + GFileInfo* _tmp123_; + DirectoryMonitorQueryInfoQueueElement* _tmp124_; + GFileMonitorEvent _tmp125_; #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!_tmp51_) { -#line 5884 "DirectoryMonitor.c" +#line 5498 "DirectoryMonitor.c" } #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp51_ = FALSE; @@ -5901,17 +5515,17 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc if (_tmp55_ == NULL) { #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = TRUE; -#line 5900 "DirectoryMonitor.c" +#line 5514 "DirectoryMonitor.c" } else { - DirectoryMonitorQueryInfoQueueElement* _tmp56_ = NULL; - gboolean _tmp57_ = FALSE; + DirectoryMonitorQueryInfoQueueElement* _tmp56_; + gboolean _tmp57_; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp56_ = next; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp57_ = _tmp56_->completed; #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp54_ = !_tmp57_; -#line 5910 "DirectoryMonitor.c" +#line 5524 "DirectoryMonitor.c" } #line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp54_) { @@ -5919,7 +5533,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 5918 "DirectoryMonitor.c" +#line 5532 "DirectoryMonitor.c" } #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp58_ = self->priv->query_info_queue; @@ -5967,19 +5581,19 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp74_ = _tmp73_->err; #line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp74_ != NULL) { -#line 5966 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp75_ = NULL; - GFile* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp79_ = NULL; - GFileMonitorEvent _tmp80_ = 0; +#line 5580 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp75_; + GFile* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + DirectoryMonitorQueryInfoQueueElement* _tmp79_; + GFileMonitorEvent _tmp80_; GEnumValue* _tmp81_; - DirectoryMonitorQueryInfoQueueElement* _tmp82_ = NULL; - GError* _tmp83_ = NULL; - const gchar* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; - gchar* _tmp86_ = NULL; + DirectoryMonitorQueryInfoQueueElement* _tmp82_; + GError* _tmp83_; + const gchar* _tmp84_; + gchar* _tmp85_; + gchar* _tmp86_; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp75_ = next; #line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6016,7 +5630,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6015 "DirectoryMonitor.c" +#line 5629 "DirectoryMonitor.c" } #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp88_ = next; @@ -6024,11 +5638,11 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp89_ = _tmp88_->info; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp89_ != NULL) { -#line 6023 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp90_ = NULL; - GFileInfo* _tmp91_ = NULL; - gchar* _tmp92_ = NULL; - gchar* _tmp93_ = NULL; +#line 5637 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp90_; + GFileInfo* _tmp91_; + gchar* _tmp92_; + gchar* _tmp93_; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp90_ = next; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6041,24 +5655,24 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp87_ = _tmp93_ == NULL; #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp93_); -#line 6040 "DirectoryMonitor.c" +#line 5654 "DirectoryMonitor.c" } else { #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = FALSE; -#line 6044 "DirectoryMonitor.c" +#line 5658 "DirectoryMonitor.c" } #line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp87_) { -#line 6048 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp94_ = NULL; - GFile* _tmp95_ = NULL; - gchar* _tmp96_ = NULL; - gchar* _tmp97_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp98_ = NULL; - GFileMonitorEvent _tmp99_ = 0; +#line 5662 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp94_; + GFile* _tmp95_; + gchar* _tmp96_; + gchar* _tmp97_; + DirectoryMonitorQueryInfoQueueElement* _tmp98_; + GFileMonitorEvent _tmp99_; GEnumValue* _tmp100_; - gchar* _tmp101_ = NULL; - gchar* _tmp102_ = NULL; + gchar* _tmp101_; + gchar* _tmp102_; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp94_ = next; #line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6089,7 +5703,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6088 "DirectoryMonitor.c" +#line 5702 "DirectoryMonitor.c" } #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp104_ = next; @@ -6097,10 +5711,10 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp105_ = _tmp104_->info; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp105_ != NULL) { -#line 6096 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp106_ = NULL; - GFileInfo* _tmp107_ = NULL; - gboolean _tmp108_ = FALSE; +#line 5710 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp106_; + GFileInfo* _tmp107_; + gboolean _tmp108_; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp106_ = next; #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6109,24 +5723,24 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_); #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp103_ = !_tmp108_; -#line 6108 "DirectoryMonitor.c" +#line 5722 "DirectoryMonitor.c" } else { #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp103_ = FALSE; -#line 6112 "DirectoryMonitor.c" +#line 5726 "DirectoryMonitor.c" } #line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp103_) { -#line 6116 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* _tmp109_ = NULL; - GFile* _tmp110_ = NULL; - gchar* _tmp111_ = NULL; - gchar* _tmp112_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp113_ = NULL; - GFileMonitorEvent _tmp114_ = 0; +#line 5730 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement* _tmp109_; + GFile* _tmp110_; + gchar* _tmp111_; + gchar* _tmp112_; + DirectoryMonitorQueryInfoQueueElement* _tmp113_; + GFileMonitorEvent _tmp114_; GEnumValue* _tmp115_; - gchar* _tmp116_ = NULL; - gchar* _tmp117_ = NULL; + gchar* _tmp116_; + gchar* _tmp117_; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp109_ = next; #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6157,7 +5771,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (next); #line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 6156 "DirectoryMonitor.c" +#line 5770 "DirectoryMonitor.c" } #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp118_ = next; @@ -6181,7 +5795,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc _directory_monitor_query_info_queue_element_unref0 (n); #line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (next); -#line 6180 "DirectoryMonitor.c" +#line 5794 "DirectoryMonitor.c" } } } @@ -6189,15 +5803,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* self, GFile* file, GFile* other_file, GFileInfo* info, GFileMonitorEvent event) { gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileMonitorEvent _tmp5_ = 0; + GFile* _tmp1_; + GFileMonitorEvent _tmp5_; GEnumValue* _tmp6_; - GFile* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - GFileMonitorEvent _tmp12_ = 0; + GFile* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GFileMonitorEvent _tmp12_; #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (IS_DIRECTORY_MONITOR (self)); #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6210,9 +5824,9 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp1_ = other_file; #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp1_ != NULL) { -#line 6209 "DirectoryMonitor.c" - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; +#line 5823 "DirectoryMonitor.c" + GFile* _tmp2_; + gchar* _tmp3_; #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = other_file; #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6221,16 +5835,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_free0 (_tmp0_); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp3_; -#line 6220 "DirectoryMonitor.c" +#line 5834 "DirectoryMonitor.c" } else { - gchar* _tmp4_ = NULL; + gchar* _tmp4_; #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = g_strdup ("(null)"); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); #line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = _tmp4_; -#line 6229 "DirectoryMonitor.c" +#line 5843 "DirectoryMonitor.c" } #line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = event; @@ -6258,13 +5872,13 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp12_) { #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CREATED: -#line 6257 "DirectoryMonitor.c" +#line 5871 "DirectoryMonitor.c" { - GFileInfo* _tmp13_ = NULL; + GFileInfo* _tmp13_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp14_ = NULL; - DirectoryMonitorFType _tmp15_ = 0; - DirectoryMonitorFType _tmp16_ = 0; + GFileInfo* _tmp14_; + DirectoryMonitorFType _tmp15_; + DirectoryMonitorFType _tmp16_; #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = info; #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6281,10 +5895,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp16_) { #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6280 "DirectoryMonitor.c" +#line 5894 "DirectoryMonitor.c" { - GFile* _tmp17_ = NULL; - GFileInfo* _tmp18_ = NULL; + GFile* _tmp17_; + GFileInfo* _tmp18_; #line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = file; #line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6293,15 +5907,15 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_); #line 1210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6292 "DirectoryMonitor.c" +#line 5906 "DirectoryMonitor.c" } #line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6296 "DirectoryMonitor.c" +#line 5910 "DirectoryMonitor.c" { - gint _tmp19_ = 0; - GFile* _tmp20_ = NULL; - GFileInfo* _tmp21_ = NULL; + gint _tmp19_; + GFile* _tmp20_; + GFileInfo* _tmp21_; #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = self->priv->outstanding_exploration_dirs; #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6314,37 +5928,37 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL); #line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6313 "DirectoryMonitor.c" +#line 5927 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp22_ = 0; + DirectoryMonitorFType _tmp22_; #line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp22_ = ftype; #line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6324 "DirectoryMonitor.c" +#line 5938 "DirectoryMonitor.c" } } #line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6329 "DirectoryMonitor.c" +#line 5943 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGED: -#line 6333 "DirectoryMonitor.c" +#line 5947 "DirectoryMonitor.c" { - GFileInfo* _tmp23_ = NULL; + GFileInfo* _tmp23_; GFileInfo* local_info = NULL; - GFile* _tmp24_ = NULL; - GFileInfo* _tmp25_ = NULL; - GFileInfo* _tmp26_ = NULL; + GFile* _tmp24_; + GFileInfo* _tmp25_; + GFileInfo* _tmp26_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp32_ = NULL; - DirectoryMonitorFType _tmp33_ = 0; - DirectoryMonitorFType _tmp34_ = 0; + GFileInfo* _tmp32_; + DirectoryMonitorFType _tmp33_; + DirectoryMonitorFType _tmp34_; #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = info; #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6359,12 +5973,12 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp26_ = local_info; #line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp26_ == NULL) { -#line 6358 "DirectoryMonitor.c" - GFile* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; +#line 5972 "DirectoryMonitor.c" + GFile* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = file; #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6385,7 +5999,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (local_info); #line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6384 "DirectoryMonitor.c" +#line 5998 "DirectoryMonitor.c" } #line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp32_ = local_info; @@ -6399,57 +6013,57 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp34_) { #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6398 "DirectoryMonitor.c" +#line 6012 "DirectoryMonitor.c" { - GFile* _tmp35_ = NULL; + GFile* _tmp35_; #line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp35_ = file; #line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_altered (self, _tmp35_); #line 1242 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6407 "DirectoryMonitor.c" +#line 6021 "DirectoryMonitor.c" } #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6411 "DirectoryMonitor.c" +#line 6025 "DirectoryMonitor.c" { - GFile* _tmp36_ = NULL; + GFile* _tmp36_; #line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp36_ = file; #line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_altered (self, _tmp36_); #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6420 "DirectoryMonitor.c" +#line 6034 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp37_ = 0; + DirectoryMonitorFType _tmp37_; #line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp37_ = ftype; #line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6431 "DirectoryMonitor.c" +#line 6045 "DirectoryMonitor.c" } } #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6438 "DirectoryMonitor.c" +#line 6052 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: -#line 6442 "DirectoryMonitor.c" +#line 6056 "DirectoryMonitor.c" { - GFileInfo* _tmp38_ = NULL; + GFileInfo* _tmp38_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp39_ = NULL; - DirectoryMonitorFType _tmp40_ = 0; - DirectoryMonitorFType _tmp41_ = 0; + GFileInfo* _tmp39_; + DirectoryMonitorFType _tmp40_; + DirectoryMonitorFType _tmp41_; #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp38_ = info; #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6466,10 +6080,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp41_) { #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6465 "DirectoryMonitor.c" +#line 6079 "DirectoryMonitor.c" { - GFile* _tmp42_ = NULL; - GFileInfo* _tmp43_ = NULL; + GFile* _tmp42_; + GFileInfo* _tmp43_; #line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp42_ = file; #line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6478,14 +6092,14 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_); #line 1261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6477 "DirectoryMonitor.c" +#line 6091 "DirectoryMonitor.c" } #line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6481 "DirectoryMonitor.c" +#line 6095 "DirectoryMonitor.c" { - GFile* _tmp44_ = NULL; - GFileInfo* _tmp45_ = NULL; + GFile* _tmp44_; + GFileInfo* _tmp45_; #line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp44_ = file; #line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6494,34 +6108,34 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_); #line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6493 "DirectoryMonitor.c" +#line 6107 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp46_ = 0; + DirectoryMonitorFType _tmp46_; #line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp46_ = ftype; #line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6504 "DirectoryMonitor.c" +#line 6118 "DirectoryMonitor.c" } } #line 1271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6509 "DirectoryMonitor.c" +#line 6123 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_MOVED: -#line 6513 "DirectoryMonitor.c" +#line 6127 "DirectoryMonitor.c" { - GFileInfo* _tmp47_ = NULL; - GFile* _tmp48_ = NULL; + GFileInfo* _tmp47_; + GFile* _tmp48_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp49_ = NULL; - DirectoryMonitorFType _tmp50_ = 0; - DirectoryMonitorFType _tmp51_ = 0; + GFileInfo* _tmp49_; + DirectoryMonitorFType _tmp50_; + DirectoryMonitorFType _tmp51_; #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp47_ = info; #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6542,11 +6156,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp51_) { #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6541 "DirectoryMonitor.c" +#line 6155 "DirectoryMonitor.c" { - GFile* _tmp52_ = NULL; - GFile* _tmp53_ = NULL; - GFileInfo* _tmp54_ = NULL; + GFile* _tmp52_; + GFile* _tmp53_; + GFileInfo* _tmp54_; #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp52_ = file; #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6557,21 +6171,21 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_); #line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6556 "DirectoryMonitor.c" +#line 6170 "DirectoryMonitor.c" } #line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6560 "DirectoryMonitor.c" +#line 6174 "DirectoryMonitor.c" { GFileInfo* old_dir_info = NULL; - DirectoryMonitorFileInfoMap* _tmp55_ = NULL; - GFile* _tmp56_ = NULL; - GFileInfo* _tmp57_ = NULL; - GFileInfo* _tmp58_ = NULL; - GFile* _tmp62_ = NULL; - GFileInfo* _tmp63_ = NULL; - GFile* _tmp64_ = NULL; - GFileInfo* _tmp65_ = NULL; + DirectoryMonitorFileInfoMap* _tmp55_; + GFile* _tmp56_; + GFileInfo* _tmp57_; + GFileInfo* _tmp58_; + GFile* _tmp62_; + GFileInfo* _tmp63_; + GFile* _tmp64_; + GFileInfo* _tmp65_; #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp55_ = self->priv->files; #line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6584,10 +6198,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp58_ = old_dir_info; #line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp58_ == NULL) { -#line 6583 "DirectoryMonitor.c" - GFile* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; +#line 6197 "DirectoryMonitor.c" + GFile* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp59_ = file; #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6602,7 +6216,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (old_dir_info); #line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6601 "DirectoryMonitor.c" +#line 6215 "DirectoryMonitor.c" } #line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp62_ = file; @@ -6618,37 +6232,37 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (old_dir_info); #line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6617 "DirectoryMonitor.c" +#line 6231 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp66_ = 0; + DirectoryMonitorFType _tmp66_; #line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp66_ = ftype; #line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6628 "DirectoryMonitor.c" +#line 6242 "DirectoryMonitor.c" } } #line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6633 "DirectoryMonitor.c" +#line 6247 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_DELETED: -#line 6637 "DirectoryMonitor.c" +#line 6251 "DirectoryMonitor.c" { - GFileInfo* _tmp67_ = NULL; + GFileInfo* _tmp67_; GFileInfo* local_info = NULL; - GFile* _tmp68_ = NULL; - GFileInfo* _tmp69_ = NULL; - GFileInfo* _tmp70_ = NULL; + GFile* _tmp68_; + GFileInfo* _tmp69_; + GFileInfo* _tmp70_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp74_ = NULL; - DirectoryMonitorFType _tmp75_ = 0; - DirectoryMonitorFType _tmp76_ = 0; + GFileInfo* _tmp74_; + DirectoryMonitorFType _tmp75_; + DirectoryMonitorFType _tmp76_; #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp67_ = info; #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6663,10 +6277,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp70_ = local_info; #line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp70_ == NULL) { -#line 6662 "DirectoryMonitor.c" - GFile* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; +#line 6276 "DirectoryMonitor.c" + GFile* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp71_ = file; #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6681,7 +6295,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (local_info); #line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6680 "DirectoryMonitor.c" +#line 6294 "DirectoryMonitor.c" } #line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp74_ = local_info; @@ -6695,61 +6309,61 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp76_) { #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6694 "DirectoryMonitor.c" +#line 6308 "DirectoryMonitor.c" { - GFile* _tmp77_ = NULL; + GFile* _tmp77_; #line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp77_ = file; #line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_file_deleted (self, _tmp77_); #line 1317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6703 "DirectoryMonitor.c" +#line 6317 "DirectoryMonitor.c" } #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6707 "DirectoryMonitor.c" +#line 6321 "DirectoryMonitor.c" { - GFile* _tmp78_ = NULL; + GFile* _tmp78_; #line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp78_ = file; #line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_internal_notify_directory_deleted (self, _tmp78_); #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6716 "DirectoryMonitor.c" +#line 6330 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp79_ = 0; + DirectoryMonitorFType _tmp79_; #line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp79_ = ftype; #line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6727 "DirectoryMonitor.c" +#line 6341 "DirectoryMonitor.c" } } #line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6734 "DirectoryMonitor.c" +#line 6348 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: -#line 6738 "DirectoryMonitor.c" +#line 6352 "DirectoryMonitor.c" { - GFileInfo* _tmp80_ = NULL; + GFileInfo* _tmp80_; GFileInfo* local_info = NULL; - GFile* _tmp81_ = NULL; - GFileInfo* _tmp82_ = NULL; - GFileInfo* _tmp83_ = NULL; + GFile* _tmp81_; + GFileInfo* _tmp82_; + GFileInfo* _tmp83_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp87_ = NULL; - DirectoryMonitorFType _tmp88_ = 0; - DirectoryMonitorFType _tmp89_ = 0; + GFileInfo* _tmp87_; + DirectoryMonitorFType _tmp88_; + DirectoryMonitorFType _tmp89_; #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp80_ = info; #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6764,10 +6378,10 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _tmp83_ = local_info; #line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp83_ == NULL) { -#line 6763 "DirectoryMonitor.c" - GFile* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; - gchar* _tmp86_ = NULL; +#line 6377 "DirectoryMonitor.c" + GFile* _tmp84_; + gchar* _tmp85_; + gchar* _tmp86_; #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp84_ = file; #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6783,7 +6397,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s _g_object_unref0 (local_info); #line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6781 "DirectoryMonitor.c" +#line 6395 "DirectoryMonitor.c" } #line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp87_ = local_info; @@ -6797,61 +6411,61 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s switch (_tmp89_) { #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 6795 "DirectoryMonitor.c" +#line 6409 "DirectoryMonitor.c" { - GFile* _tmp90_ = NULL; + GFile* _tmp90_; #line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp90_ = file; #line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_file_attributes_altered (self, _tmp90_); #line 1344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6804 "DirectoryMonitor.c" +#line 6418 "DirectoryMonitor.c" } #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 6808 "DirectoryMonitor.c" +#line 6422 "DirectoryMonitor.c" { - GFile* _tmp91_ = NULL; + GFile* _tmp91_; #line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp91_ = file; #line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_notify_directory_attributes_altered (self, _tmp91_); #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6817 "DirectoryMonitor.c" +#line 6431 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp92_ = 0; + DirectoryMonitorFType _tmp92_; #line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp92_ = ftype; #line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 1352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6828 "DirectoryMonitor.c" +#line 6442 "DirectoryMonitor.c" } } #line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (local_info); #line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6835 "DirectoryMonitor.c" +#line 6449 "DirectoryMonitor.c" } #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_PRE_UNMOUNT: #line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case G_FILE_MONITOR_EVENT_UNMOUNTED: -#line 6841 "DirectoryMonitor.c" +#line 6455 "DirectoryMonitor.c" { #line 1359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6845 "DirectoryMonitor.c" +#line 6459 "DirectoryMonitor.c" } default: { - GFileMonitorEvent _tmp93_ = 0; + GFileMonitorEvent _tmp93_; GEnumValue* _tmp94_; #line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp93_ = event; @@ -6861,24 +6475,24 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s g_warning ("DirectoryMonitor.vala:1362: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL); #line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 6859 "DirectoryMonitor.c" +#line 6473 "DirectoryMonitor.c" } } #line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp0_); -#line 6864 "DirectoryMonitor.c" +#line 6478 "DirectoryMonitor.c" } -static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile** old_file, GFileInfo** old_file_info) { +static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, GFile* file, GFileInfo* info, GFile* * old_file, GFileInfo* * old_file_info) { GFile* _vala_old_file = NULL; GFileInfo* _vala_old_file_info = NULL; gboolean result = FALSE; GFile* match = NULL; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFileInfo* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; #line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6897,15 +6511,15 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G _tmp3_ = match; #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp3_ != NULL) { -#line 6895 "DirectoryMonitor.c" - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - DirectoryMonitorFileInfoMap* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFileInfo* _tmp8_ = NULL; - DirectoryMonitorFileInfoMap* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFileInfo* _tmp11_ = NULL; +#line 6509 "DirectoryMonitor.c" + GFile* _tmp4_; + GFile* _tmp5_; + DirectoryMonitorFileInfoMap* _tmp6_; + GFile* _tmp7_; + GFileInfo* _tmp8_; + DirectoryMonitorFileInfoMap* _tmp9_; + GFile* _tmp10_; + GFileInfo* _tmp11_; #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = match; #line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -6940,25 +6554,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G if (old_file) { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6938 "DirectoryMonitor.c" +#line 6552 "DirectoryMonitor.c" } else { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6942 "DirectoryMonitor.c" +#line 6556 "DirectoryMonitor.c" } #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6948 "DirectoryMonitor.c" +#line 6562 "DirectoryMonitor.c" } else { #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6952 "DirectoryMonitor.c" +#line 6566 "DirectoryMonitor.c" } #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6956 "DirectoryMonitor.c" +#line 6570 "DirectoryMonitor.c" } #line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); @@ -6976,36 +6590,36 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G if (old_file) { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file = _vala_old_file; -#line 6974 "DirectoryMonitor.c" +#line 6588 "DirectoryMonitor.c" } else { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file); -#line 6978 "DirectoryMonitor.c" +#line 6592 "DirectoryMonitor.c" } #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old_file_info) { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *old_file_info = _vala_old_file_info; -#line 6984 "DirectoryMonitor.c" +#line 6598 "DirectoryMonitor.c" } else { #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_old_file_info); -#line 6988 "DirectoryMonitor.c" +#line 6602 "DirectoryMonitor.c" } #line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 6992 "DirectoryMonitor.c" +#line 6606 "DirectoryMonitor.c" } static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMonitor* self) { gboolean result = FALSE; gulong expiration = 0UL; - gulong _tmp0_ = 0UL; + gulong _tmp0_; gboolean any_deleted = FALSE; gboolean any_expired = FALSE; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; + gboolean _tmp13_; + gboolean _tmp14_; #line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE); #line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7016,11 +6630,11 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni any_deleted = FALSE; #line 1392 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_expired = FALSE; -#line 7014 "DirectoryMonitor.c" +#line 6628 "DirectoryMonitor.c" { GeeIterator* _element_it = NULL; - GeeQueue* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeQueue* _tmp1_; + GeeIterator* _tmp2_; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = self->priv->query_info_queue; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7029,18 +6643,18 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni _element_it = _tmp2_; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 7027 "DirectoryMonitor.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 6641 "DirectoryMonitor.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DirectoryMonitorQueryInfoQueueElement* element = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DirectoryMonitorQueryInfoQueueElement* _tmp7_ = NULL; - GFileMonitorEvent _tmp8_ = 0; - DirectoryMonitorQueryInfoQueueElement* _tmp9_ = NULL; - gulong _tmp10_ = 0UL; - gulong _tmp11_ = 0UL; - DirectoryMonitorQueryInfoQueueElement* _tmp12_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DirectoryMonitorQueryInfoQueueElement* _tmp7_; + GFileMonitorEvent _tmp8_; + DirectoryMonitorQueryInfoQueueElement* _tmp9_; + gulong _tmp10_; + gulong _tmp11_; + DirectoryMonitorQueryInfoQueueElement* _tmp12_; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = _element_it; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7049,7 +6663,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni if (!_tmp4_) { #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 7047 "DirectoryMonitor.c" +#line 6661 "DirectoryMonitor.c" } #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _element_it; @@ -7067,7 +6681,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni _directory_monitor_query_info_queue_element_unref0 (element); #line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 7065 "DirectoryMonitor.c" +#line 6679 "DirectoryMonitor.c" } #line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" any_deleted = TRUE; @@ -7083,7 +6697,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni _directory_monitor_query_info_queue_element_unref0 (element); #line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 7081 "DirectoryMonitor.c" +#line 6695 "DirectoryMonitor.c" } #line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = element; @@ -7093,11 +6707,11 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni any_expired = TRUE; #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _directory_monitor_query_info_queue_element_unref0 (element); -#line 7091 "DirectoryMonitor.c" +#line 6705 "DirectoryMonitor.c" } #line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_element_it); -#line 7095 "DirectoryMonitor.c" +#line 6709 "DirectoryMonitor.c" } #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = any_expired; @@ -7105,7 +6719,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni if (_tmp13_) { #line 1408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_process_query_queue (self, NULL); -#line 7103 "DirectoryMonitor.c" +#line 6717 "DirectoryMonitor.c" } #line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = any_deleted; @@ -7113,21 +6727,21 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni if (!_tmp14_) { #line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 7111 "DirectoryMonitor.c" +#line 6725 "DirectoryMonitor.c" } #line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = any_deleted; #line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7117 "DirectoryMonitor.c" +#line 6731 "DirectoryMonitor.c" } GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) { GFileInfo* result = NULL; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GFileInfo* _tmp2_; #line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); #line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7142,14 +6756,14 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file) result = _tmp2_; #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7140 "DirectoryMonitor.c" +#line 6754 "DirectoryMonitor.c" } GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) { GeeCollection* result = NULL; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GeeCollection* _tmp1_; #line 1423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); #line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7160,16 +6774,16 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) { result = _tmp1_; #line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7158 "DirectoryMonitor.c" +#line 6772 "DirectoryMonitor.c" } GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* file) { GFileInfo* result = NULL; - DirectoryMonitorFileInfoMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GCancellable* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; + DirectoryMonitorFileInfoMap* _tmp0_; + GFile* _tmp1_; + GCancellable* _tmp2_; + GFileInfo* _tmp3_; #line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL); #line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7186,18 +6800,18 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil result = _tmp3_; #line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7184 "DirectoryMonitor.c" +#line 6798 "DirectoryMonitor.c" } gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { gboolean result = FALSE; - GFileInfo* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GFileInfo* _tmp0_; + gboolean _tmp1_; DirectoryMonitorFType ftype = 0; - GFileInfo* _tmp2_ = NULL; - DirectoryMonitorFType _tmp3_ = 0; - DirectoryMonitorFType _tmp4_ = 0; + GFileInfo* _tmp2_; + DirectoryMonitorFType _tmp3_; + DirectoryMonitorFType _tmp4_; #line 1441 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7210,7 +6824,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { result = TRUE; #line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7208 "DirectoryMonitor.c" +#line 6822 "DirectoryMonitor.c" } #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = info; @@ -7224,27 +6838,27 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { switch (_tmp4_) { #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 7222 "DirectoryMonitor.c" +#line 6836 "DirectoryMonitor.c" { #line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS; #line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7228 "DirectoryMonitor.c" +#line 6842 "DirectoryMonitor.c" } #line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 7232 "DirectoryMonitor.c" +#line 6846 "DirectoryMonitor.c" { #line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS; #line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7238 "DirectoryMonitor.c" +#line 6852 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp5_ = 0; + DirectoryMonitorFType _tmp5_; #line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = ftype; #line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7253,7 +6867,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) { result = FALSE; #line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 7251 "DirectoryMonitor.c" +#line 6865 "DirectoryMonitor.c" } } } @@ -7266,7 +6880,7 @@ static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* ol g_return_if_fail (G_IS_FILE (new_root)); #line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_root_info)); -#line 7264 "DirectoryMonitor.c" +#line 6878 "DirectoryMonitor.c" } @@ -7285,26 +6899,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7283 "DirectoryMonitor.c" +#line 6897 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 7289 "DirectoryMonitor.c" +#line 6903 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 7295 "DirectoryMonitor.c" +#line 6909 "DirectoryMonitor.c" } static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) { #line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (root)); -#line 7302 "DirectoryMonitor.c" +#line 6916 "DirectoryMonitor.c" } @@ -7317,7 +6931,7 @@ static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFil g_return_if_fail (G_IS_FILE (file)); #line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7315 "DirectoryMonitor.c" +#line 6929 "DirectoryMonitor.c" } @@ -7336,19 +6950,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = param_values->data[0].v_pointer; -#line 7334 "DirectoryMonitor.c" +#line 6948 "DirectoryMonitor.c" } else { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data1 = param_values->data[0].v_pointer; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" data2 = closure->data; -#line 7340 "DirectoryMonitor.c" +#line 6954 "DirectoryMonitor.c" } #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 7346 "DirectoryMonitor.c" +#line 6960 "DirectoryMonitor.c" } @@ -7357,14 +6971,14 @@ static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, g_return_if_fail (G_IS_FILE (file)); #line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7355 "DirectoryMonitor.c" +#line 6969 "DirectoryMonitor.c" } static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) { #line 408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (reason != NULL); -#line 7362 "DirectoryMonitor.c" +#line 6976 "DirectoryMonitor.c" } @@ -7373,7 +6987,7 @@ static void directory_monitor_real_discovery_completed (DirectoryMonitor* self) self->priv->has_discovery_started = FALSE; #line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_mdbg ("discovery completed"); -#line 7371 "DirectoryMonitor.c" +#line 6985 "DirectoryMonitor.c" } @@ -7382,7 +6996,7 @@ static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile* g_return_if_fail (G_IS_FILE (file)); #line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7380 "DirectoryMonitor.c" +#line 6994 "DirectoryMonitor.c" } @@ -7393,14 +7007,14 @@ static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* ol g_return_if_fail (G_IS_FILE (new_file)); #line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_file_info)); -#line 7391 "DirectoryMonitor.c" +#line 7005 "DirectoryMonitor.c" } static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) { #line 423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7398 "DirectoryMonitor.c" +#line 7012 "DirectoryMonitor.c" } @@ -7409,21 +7023,21 @@ static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* g_return_if_fail (G_IS_FILE (file)); #line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7407 "DirectoryMonitor.c" +#line 7021 "DirectoryMonitor.c" } static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) { #line 431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7414 "DirectoryMonitor.c" +#line 7028 "DirectoryMonitor.c" } static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) { #line 434 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (file)); -#line 7421 "DirectoryMonitor.c" +#line 7035 "DirectoryMonitor.c" } @@ -7432,7 +7046,7 @@ static void directory_monitor_real_directory_created (DirectoryMonitor* self, GF g_return_if_fail (G_IS_FILE (dir)); #line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7430 "DirectoryMonitor.c" +#line 7044 "DirectoryMonitor.c" } @@ -7443,14 +7057,14 @@ static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFil g_return_if_fail (G_IS_FILE (new_dir)); #line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (new_dir_info)); -#line 7441 "DirectoryMonitor.c" +#line 7055 "DirectoryMonitor.c" } static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) { #line 446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7448 "DirectoryMonitor.c" +#line 7062 "DirectoryMonitor.c" } @@ -7459,21 +7073,21 @@ static void directory_monitor_real_directory_alteration_completed (DirectoryMoni g_return_if_fail (G_IS_FILE (dir)); #line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); -#line 7457 "DirectoryMonitor.c" +#line 7071 "DirectoryMonitor.c" } static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) { #line 454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7464 "DirectoryMonitor.c" +#line 7078 "DirectoryMonitor.c" } static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) { #line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_IS_FILE (dir)); -#line 7471 "DirectoryMonitor.c" +#line 7085 "DirectoryMonitor.c" } @@ -7483,15 +7097,15 @@ static void directory_monitor_real_closed (DirectoryMonitor* self) { static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_construct (GType object_type, DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) { DirectoryMonitorQueryInfoQueueElement* self = NULL; - DirectoryMonitor* _tmp0_ = NULL; - DirectoryMonitor* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFileMonitorEvent _tmp6_ = 0; - guint _tmp7_ = 0U; - gulong _tmp8_ = 0UL; + DirectoryMonitor* _tmp0_; + DirectoryMonitor* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + GFileMonitorEvent _tmp6_; + guint _tmp7_; + gulong _tmp8_; #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (IS_DIRECTORY_MONITOR (owner), NULL); #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7540,29 +7154,29 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue self->time_created_msec = _tmp8_; #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7538 "DirectoryMonitor.c" +#line 7152 "DirectoryMonitor.c" } static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) { #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_query_info_queue_element_construct (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, owner, file, other_file, event); -#line 7545 "DirectoryMonitor.c" +#line 7159 "DirectoryMonitor.c" } static gpointer _g_error_copy0 (gpointer self) { #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self ? g_error_copy (self) : NULL; -#line 7552 "DirectoryMonitor.c" +#line 7166 "DirectoryMonitor.c" } static void directory_monitor_query_info_queue_element_on_completed (DirectoryMonitorQueryInfoQueueElement* self, GObject* source, GAsyncResult* aresult) { GFile* source_file = NULL; - GObject* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - DirectoryMonitor* _tmp16_ = NULL; + GObject* _tmp0_; + GFile* _tmp1_; + DirectoryMonitor* _tmp16_; GError * _inner_error_ = NULL; #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (self)); @@ -7576,16 +7190,16 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile)); #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" source_file = _tmp1_; -#line 7574 "DirectoryMonitor.c" +#line 7188 "DirectoryMonitor.c" { GFileInfo* _tmp2_ = NULL; - GAsyncResult* _tmp3_ = NULL; - GFileInfo* _tmp4_ = NULL; - GFileInfo* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + GAsyncResult* _tmp3_; + GFileInfo* _tmp4_; + GFileInfo* _tmp5_; + GFileInfo* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gboolean _tmp9_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = aresult; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7594,8 +7208,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _tmp2_ = _tmp4_; #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7592 "DirectoryMonitor.c" - goto __catch483_g_error; +#line 7206 "DirectoryMonitor.c" + goto __catch484_g_error; } #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = _tmp2_; @@ -7617,11 +7231,11 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo _g_free0 (_tmp8_); #line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp9_) { -#line 7615 "DirectoryMonitor.c" - GFileInfo* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 7229 "DirectoryMonitor.c" + GFileInfo* _tmp10_; + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->info; #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7634,18 +7248,18 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo g_file_info_set_attribute_string (_tmp10_, G_FILE_ATTRIBUTE_ID_FILE, _tmp13_); #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp13_); -#line 7632 "DirectoryMonitor.c" +#line 7246 "DirectoryMonitor.c" } #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp2_); -#line 7636 "DirectoryMonitor.c" +#line 7250 "DirectoryMonitor.c" } - goto __finally483; - __catch483_g_error: + goto __finally484; + __catch484_g_error: { GError* err = NULL; - GError* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + GError* _tmp14_; + GError* _tmp15_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7660,9 +7274,9 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo self->err = _tmp15_; #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (err); -#line 7658 "DirectoryMonitor.c" +#line 7272 "DirectoryMonitor.c" } - __finally483: + __finally484: #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7673,7 +7287,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo g_clear_error (&_inner_error_); #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return; -#line 7671 "DirectoryMonitor.c" +#line 7285 "DirectoryMonitor.c" } #line 121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->completed = TRUE; @@ -7683,14 +7297,14 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo directory_monitor_process_query_queue (_tmp16_, self); #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (source_file); -#line 7681 "DirectoryMonitor.c" +#line 7295 "DirectoryMonitor.c" } static void directory_monitor_value_query_info_queue_element_init (GValue* value) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7688 "DirectoryMonitor.c" +#line 7302 "DirectoryMonitor.c" } @@ -7699,7 +7313,7 @@ static void directory_monitor_value_query_info_queue_element_free_value (GValue* if (value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (value->data[0].v_pointer); -#line 7697 "DirectoryMonitor.c" +#line 7311 "DirectoryMonitor.c" } } @@ -7709,11 +7323,11 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G if (src_value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (src_value->data[0].v_pointer); -#line 7707 "DirectoryMonitor.c" +#line 7321 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 7711 "DirectoryMonitor.c" +#line 7325 "DirectoryMonitor.c" } } @@ -7721,66 +7335,66 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G static gpointer directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7719 "DirectoryMonitor.c" +#line 7333 "DirectoryMonitor.c" } static gchar* directory_monitor_value_query_info_queue_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 7726 "DirectoryMonitor.c" - DirectoryMonitorQueryInfoQueueElement* object; +#line 7340 "DirectoryMonitor.c" + DirectoryMonitorQueryInfoQueueElement * object; object = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7733 "DirectoryMonitor.c" +#line 7347 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 7737 "DirectoryMonitor.c" +#line 7351 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (object); -#line 7741 "DirectoryMonitor.c" +#line 7355 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7745 "DirectoryMonitor.c" +#line 7359 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7749 "DirectoryMonitor.c" +#line 7363 "DirectoryMonitor.c" } static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DirectoryMonitorQueryInfoQueueElement** object_p; + DirectoryMonitorQueryInfoQueueElement ** object_p; object_p = collect_values[0].v_pointer; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!object_p) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7760 "DirectoryMonitor.c" +#line 7374 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 7766 "DirectoryMonitor.c" +#line 7380 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 7770 "DirectoryMonitor.c" +#line 7384 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7774 "DirectoryMonitor.c" +#line 7388 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 7778 "DirectoryMonitor.c" +#line 7392 "DirectoryMonitor.c" } @@ -7794,7 +7408,7 @@ static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const G_PARAM_SPEC (spec)->value_type = object_type; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 7792 "DirectoryMonitor.c" +#line 7406 "DirectoryMonitor.c" } @@ -7803,12 +7417,12 @@ static gpointer directory_monitor_value_get_query_info_queue_element (const GVal g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 7801 "DirectoryMonitor.c" +#line 7415 "DirectoryMonitor.c" } static void directory_monitor_value_set_query_info_queue_element (GValue* value, gpointer v_object) { - DirectoryMonitorQueryInfoQueueElement* old; + DirectoryMonitorQueryInfoQueueElement * old; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT)); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7823,23 +7437,23 @@ static void directory_monitor_value_set_query_info_queue_element (GValue* value, value->data[0].v_pointer = v_object; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer); -#line 7821 "DirectoryMonitor.c" +#line 7435 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7825 "DirectoryMonitor.c" +#line 7439 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7831 "DirectoryMonitor.c" +#line 7445 "DirectoryMonitor.c" } } static void directory_monitor_value_take_query_info_queue_element (GValue* value, gpointer v_object) { - DirectoryMonitorQueryInfoQueueElement* old; + DirectoryMonitorQueryInfoQueueElement * old; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT)); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7852,17 +7466,17 @@ static void directory_monitor_value_take_query_info_queue_element (GValue* value g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 7850 "DirectoryMonitor.c" +#line 7464 "DirectoryMonitor.c" } else { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 7854 "DirectoryMonitor.c" +#line 7468 "DirectoryMonitor.c" } #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_query_info_queue_element_unref (old); -#line 7860 "DirectoryMonitor.c" +#line 7474 "DirectoryMonitor.c" } } @@ -7872,7 +7486,7 @@ static void directory_monitor_query_info_queue_element_class_init (DirectoryMoni directory_monitor_query_info_queue_element_parent_class = g_type_class_peek_parent (klass); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorQueryInfoQueueElementClass *) klass)->finalize = directory_monitor_query_info_queue_element_finalize; -#line 7870 "DirectoryMonitor.c" +#line 7484 "DirectoryMonitor.c" } @@ -7885,11 +7499,11 @@ static void directory_monitor_query_info_queue_element_instance_init (DirectoryM self->completed = FALSE; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 7883 "DirectoryMonitor.c" +#line 7497 "DirectoryMonitor.c" } -static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement* obj) { +static void directory_monitor_query_info_queue_element_finalize (DirectoryMonitorQueryInfoQueueElement * obj) { DirectoryMonitorQueryInfoQueueElement * self; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, DirectoryMonitorQueryInfoQueueElement); @@ -7905,7 +7519,7 @@ static void directory_monitor_query_info_queue_element_finalize (DirectoryMonito _g_object_unref0 (self->info); #line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_error_free0 (self->err); -#line 7903 "DirectoryMonitor.c" +#line 7517 "DirectoryMonitor.c" } @@ -7924,18 +7538,18 @@ static GType directory_monitor_query_info_queue_element_get_type (void) { static gpointer directory_monitor_query_info_queue_element_ref (gpointer instance) { - DirectoryMonitorQueryInfoQueueElement* self; + DirectoryMonitorQueryInfoQueueElement * self; self = instance; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 7928 "DirectoryMonitor.c" +#line 7542 "DirectoryMonitor.c" } static void directory_monitor_query_info_queue_element_unref (gpointer instance) { - DirectoryMonitorQueryInfoQueueElement* self; + DirectoryMonitorQueryInfoQueueElement * self; self = instance; #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -7943,7 +7557,7 @@ static void directory_monitor_query_info_queue_element_unref (gpointer instance) DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self); #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7941 "DirectoryMonitor.c" +#line 7555 "DirectoryMonitor.c" } } @@ -7954,38 +7568,38 @@ static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (G self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type); #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return self; -#line 7952 "DirectoryMonitor.c" +#line 7566 "DirectoryMonitor.c" } static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) { #line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP); -#line 7959 "DirectoryMonitor.c" +#line 7573 "DirectoryMonitor.c" } -static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile** normalized, gchar** id) { +static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info, GFile* * normalized, gchar* * id) { GFile* _vala_normalized = NULL; gchar* _vala_id = NULL; gboolean result = FALSE; GFileInfo* local_info = NULL; - GFileInfo* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; + GFileInfo* _tmp0_; + GFileInfo* _tmp1_; + GFileInfo* _tmp2_; gchar* file_id = NULL; - GFileInfo* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + GFileInfo* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; GFile* known_file = NULL; - GeeHashMap* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + GeeHashMap* _tmp10_; + const gchar* _tmp11_; + gpointer _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; GFile* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - GFile* _tmp19_ = NULL; + GFile* _tmp16_; + GFile* _tmp19_; #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8002,11 +7616,11 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor _tmp2_ = local_info; #line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_ == NULL) { -#line 8000 "DirectoryMonitor.c" - GeeHashMap* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; +#line 7614 "DirectoryMonitor.c" + GeeHashMap* _tmp3_; + GFile* _tmp4_; + gpointer _tmp5_; + GFileInfo* _tmp6_; #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = self->priv->map; #line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8037,25 +7651,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8035 "DirectoryMonitor.c" +#line 7649 "DirectoryMonitor.c" } else { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8039 "DirectoryMonitor.c" +#line 7653 "DirectoryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8045 "DirectoryMonitor.c" +#line 7659 "DirectoryMonitor.c" } else { #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8049 "DirectoryMonitor.c" +#line 7663 "DirectoryMonitor.c" } #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8053 "DirectoryMonitor.c" +#line 7667 "DirectoryMonitor.c" } } #line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8086,25 +7700,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8084 "DirectoryMonitor.c" +#line 7698 "DirectoryMonitor.c" } else { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8088 "DirectoryMonitor.c" +#line 7702 "DirectoryMonitor.c" } #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8094 "DirectoryMonitor.c" +#line 7708 "DirectoryMonitor.c" } else { #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8098 "DirectoryMonitor.c" +#line 7712 "DirectoryMonitor.c" } #line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8102 "DirectoryMonitor.c" +#line 7716 "DirectoryMonitor.c" } #line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp10_ = self->priv->id_map; @@ -8126,20 +7740,20 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor _tmp16_ = known_file; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp16_ != NULL) { -#line 8124 "DirectoryMonitor.c" - GFile* _tmp17_ = NULL; +#line 7738 "DirectoryMonitor.c" + GFile* _tmp17_; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = known_file; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp17_; -#line 8130 "DirectoryMonitor.c" +#line 7744 "DirectoryMonitor.c" } else { - GFile* _tmp18_ = NULL; + GFile* _tmp18_; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _tmp18_; -#line 8137 "DirectoryMonitor.c" +#line 7751 "DirectoryMonitor.c" } #line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = _g_object_ref0 (_tmp15_); @@ -8159,51 +7773,51 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor if (normalized) { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *normalized = _vala_normalized; -#line 8157 "DirectoryMonitor.c" +#line 7771 "DirectoryMonitor.c" } else { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_vala_normalized); -#line 8161 "DirectoryMonitor.c" +#line 7775 "DirectoryMonitor.c" } #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (id) { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *id = _vala_id; -#line 8167 "DirectoryMonitor.c" +#line 7781 "DirectoryMonitor.c" } else { #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_vala_id); -#line 8171 "DirectoryMonitor.c" +#line 7785 "DirectoryMonitor.c" } #line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8175 "DirectoryMonitor.c" +#line 7789 "DirectoryMonitor.c" } static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; gchar* existing_id = NULL; - GFileInfo* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GFileInfo* _tmp7_; + gchar* _tmp8_; gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp18_ = NULL; - GFileInfo* _tmp19_ = NULL; + GFile* _tmp18_; + GFileInfo* _tmp19_; GFile* _tmp20_ = NULL; gchar* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - GeeHashMap* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; - GFileInfo* _tmp25_ = NULL; - GeeHashMap* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; + gboolean _tmp22_; + GeeHashMap* _tmp23_; + GFile* _tmp24_; + GFileInfo* _tmp25_; + GeeHashMap* _tmp26_; + const gchar* _tmp27_; + GFile* _tmp28_; #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8218,12 +7832,12 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); #line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp2_) { -#line 8216 "DirectoryMonitor.c" +#line 7830 "DirectoryMonitor.c" gboolean removed = FALSE; - GeeHashMap* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; + GeeHashMap* _tmp3_; + GFile* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = self->priv->map; #line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8236,7 +7850,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp6_ = removed; #line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp6_, "removed"); -#line 8234 "DirectoryMonitor.c" +#line 7848 "DirectoryMonitor.c" } #line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = info; @@ -8248,10 +7862,10 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp10_ = existing_id; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp10_ != NULL) { -#line 8246 "DirectoryMonitor.c" - GeeHashMap* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; +#line 7860 "DirectoryMonitor.c" + GeeHashMap* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp11_ = self->priv->id_map; #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8260,20 +7874,20 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_); #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = _tmp13_; -#line 8258 "DirectoryMonitor.c" +#line 7872 "DirectoryMonitor.c" } else { #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp9_ = FALSE; -#line 8262 "DirectoryMonitor.c" +#line 7876 "DirectoryMonitor.c" } #line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp9_) { -#line 8266 "DirectoryMonitor.c" +#line 7880 "DirectoryMonitor.c" gboolean removed = FALSE; - GeeHashMap* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; + GeeHashMap* _tmp14_; + const gchar* _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = self->priv->id_map; #line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8286,7 +7900,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _tmp17_ = removed; #line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp17_, "removed"); -#line 8284 "DirectoryMonitor.c" +#line 7898 "DirectoryMonitor.c" } #line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = file; @@ -8314,7 +7928,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _g_free0 (existing_id); #line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8312 "DirectoryMonitor.c" +#line 7926 "DirectoryMonitor.c" } #line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = self->priv->map; @@ -8342,7 +7956,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo _g_free0 (existing_id); #line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8340 "DirectoryMonitor.c" +#line 7954 "DirectoryMonitor.c" } @@ -8350,15 +7964,15 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo gboolean result = FALSE; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; + GFile* _tmp0_; + GFileInfo* _tmp1_; GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - GeeHashMap* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GeeHashMap* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + gboolean _tmp4_; + GeeHashMap* _tmp5_; + GFile* _tmp6_; + GeeHashMap* _tmp7_; + const gchar* _tmp8_; #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8389,7 +8003,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo _g_free0 (id); #line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8387 "DirectoryMonitor.c" +#line 8001 "DirectoryMonitor.c" } #line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->map; @@ -8411,7 +8025,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo _g_free0 (id); #line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8409 "DirectoryMonitor.c" +#line 8023 "DirectoryMonitor.c" } @@ -8420,11 +8034,11 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); #line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (files)); -#line 8418 "DirectoryMonitor.c" +#line 8032 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = files; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8433,13 +8047,13 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo _file_it = _tmp1_; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8431 "DirectoryMonitor.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 8045 "DirectoryMonitor.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; GFile* file = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - GFile* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + GFile* _tmp6_; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp2_ = _file_it; #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8448,7 +8062,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo if (!_tmp3_) { #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 8446 "DirectoryMonitor.c" +#line 8060 "DirectoryMonitor.c" } #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = _file_it; @@ -8462,11 +8076,11 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo directory_monitor_file_info_map_remove (self, _tmp6_, NULL); #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 8460 "DirectoryMonitor.c" +#line 8074 "DirectoryMonitor.c" } #line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 8464 "DirectoryMonitor.c" +#line 8078 "DirectoryMonitor.c" } } @@ -8475,14 +8089,14 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn gboolean result = FALSE; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; + GFile* _tmp0_; + GFileInfo* _tmp1_; GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - GeeHashMap* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + gboolean _tmp4_; + GeeHashMap* _tmp5_; + const gchar* _tmp6_; + gboolean _tmp7_; #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE); #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8513,7 +8127,7 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn _g_free0 (id); #line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8511 "DirectoryMonitor.c" +#line 8125 "DirectoryMonitor.c" } #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp5_ = self->priv->id_map; @@ -8529,19 +8143,19 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn _g_free0 (id); #line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8527 "DirectoryMonitor.c" +#line 8141 "DirectoryMonitor.c" } static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMap* self, GFile* file, GFileInfo* info) { gchar* result = NULL; - GFileInfo* _tmp0_ = NULL; + GFileInfo* _tmp0_; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp3_ = NULL; + GFile* _tmp3_; GFile* _tmp4_ = NULL; gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + gboolean _tmp6_; #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); #line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8552,9 +8166,9 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _tmp0_ = info; #line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp0_ != NULL) { -#line 8550 "DirectoryMonitor.c" - GFileInfo* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; +#line 8164 "DirectoryMonitor.c" + GFileInfo* _tmp1_; + gchar* _tmp2_; #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp1_ = info; #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8563,7 +8177,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa result = _tmp2_; #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8561 "DirectoryMonitor.c" +#line 8175 "DirectoryMonitor.c" } #line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = file; @@ -8587,7 +8201,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _g_free0 (id); #line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8585 "DirectoryMonitor.c" +#line 8199 "DirectoryMonitor.c" } #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = id; @@ -8595,15 +8209,15 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa _g_object_unref0 (normalized); #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8593 "DirectoryMonitor.c" +#line 8207 "DirectoryMonitor.c" } static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorFileInfoMap* self) { GeeCollection* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); #line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8616,26 +8230,26 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8614 "DirectoryMonitor.c" +#line 8228 "DirectoryMonitor.c" } static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFileInfoMap* self, GFile* file) { GFileInfo* result = NULL; GFileInfo* info = NULL; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gpointer _tmp2_; + GFileInfo* _tmp3_; gchar* id = NULL; GFile* normalized = NULL; - GFile* _tmp4_ = NULL; + GFile* _tmp4_; GFile* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GeeHashMap* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; + gboolean _tmp7_; + GeeHashMap* _tmp8_; + GFile* _tmp9_; + gpointer _tmp10_; #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8656,7 +8270,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile result = info; #line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8654 "DirectoryMonitor.c" +#line 8268 "DirectoryMonitor.c" } #line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; @@ -8682,7 +8296,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile _g_object_unref0 (info); #line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8680 "DirectoryMonitor.c" +#line 8294 "DirectoryMonitor.c" } #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = self->priv->map; @@ -8700,31 +8314,31 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile _g_object_unref0 (info); #line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8698 "DirectoryMonitor.c" +#line 8312 "DirectoryMonitor.c" } static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFileInfoMap* self, GFile* file, GCancellable* cancellable) { GFileInfo* result = NULL; GFileInfo* info = NULL; - GFile* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; - GFileInfo* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + GFile* _tmp0_; + GFileInfo* _tmp1_; + GFileInfo* _tmp2_; + GFileInfo* _tmp13_; + gboolean _tmp14_; gchar* id = NULL; - GFileInfo* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + GFileInfo* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; GFile* normalized = NULL; - GeeHashMap* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gpointer _tmp25_ = NULL; - GFile* _tmp26_ = NULL; - GeeHashMap* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - gpointer _tmp29_ = NULL; + GeeHashMap* _tmp23_; + const gchar* _tmp24_; + gpointer _tmp25_; + GFile* _tmp26_; + GeeHashMap* _tmp27_; + GFile* _tmp28_; + gpointer _tmp29_; GError * _inner_error_ = NULL; #line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); @@ -8746,14 +8360,14 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi result = info; #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8744 "DirectoryMonitor.c" +#line 8358 "DirectoryMonitor.c" } { GFileInfo* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GCancellable* _tmp5_ = NULL; - GFileInfo* _tmp6_ = NULL; - GFileInfo* _tmp7_ = NULL; + GFile* _tmp4_; + GCancellable* _tmp5_; + GFileInfo* _tmp6_; + GFileInfo* _tmp7_; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp4_ = file; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8764,8 +8378,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _tmp3_ = _tmp6_; #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8762 "DirectoryMonitor.c" - goto __catch484_g_error; +#line 8376 "DirectoryMonitor.c" + goto __catch485_g_error; } #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = _tmp3_; @@ -8777,17 +8391,17 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi info = _tmp7_; #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_tmp3_); -#line 8775 "DirectoryMonitor.c" +#line 8389 "DirectoryMonitor.c" } - goto __finally484; - __catch484_g_error: + goto __finally485; + __catch485_g_error: { GError* err = NULL; - GFile* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GError* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + GFile* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" err = _inner_error_; #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8814,9 +8428,9 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8812 "DirectoryMonitor.c" +#line 8426 "DirectoryMonitor.c" } - __finally484: + __finally485: #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8827,7 +8441,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi g_clear_error (&_inner_error_); #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 8825 "DirectoryMonitor.c" +#line 8439 "DirectoryMonitor.c" } #line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = info; @@ -8841,7 +8455,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8839 "DirectoryMonitor.c" +#line 8453 "DirectoryMonitor.c" } #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = info; @@ -8855,11 +8469,11 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _tmp18_ = id; #line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp18_ == NULL) { -#line 8853 "DirectoryMonitor.c" - GFileInfo* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; +#line 8467 "DirectoryMonitor.c" + GFileInfo* _tmp19_; + GFile* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp19_ = info; #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8872,7 +8486,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi g_file_info_set_attribute_string (_tmp19_, G_FILE_ATTRIBUTE_ID_FILE, _tmp22_); #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_free0 (_tmp22_); -#line 8870 "DirectoryMonitor.c" +#line 8484 "DirectoryMonitor.c" } #line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp23_ = self->priv->id_map; @@ -8896,7 +8510,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8894 "DirectoryMonitor.c" +#line 8508 "DirectoryMonitor.c" } #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = self->priv->map; @@ -8914,21 +8528,21 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi _g_object_unref0 (info); #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8912 "DirectoryMonitor.c" +#line 8526 "DirectoryMonitor.c" } static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileInfoMap* self, GFileInfo* match) { GFile* result = NULL; gchar* match_id = NULL; - GFileInfo* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + GFileInfo* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; gint64 match_size = 0LL; - GFileInfo* _tmp3_ = NULL; - gint64 _tmp4_ = 0LL; + GFileInfo* _tmp3_; + gint64 _tmp4_; GTimeVal match_time = {0}; - GFileInfo* _tmp5_ = NULL; + GFileInfo* _tmp5_; GTimeVal _tmp6_ = {0}; #line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL); @@ -8950,7 +8564,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 8948 "DirectoryMonitor.c" +#line 8562 "DirectoryMonitor.c" } #line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp3_ = match; @@ -8964,15 +8578,15 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn g_file_info_get_modification_time (_tmp5_, &_tmp6_); #line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" match_time = _tmp6_; -#line 8962 "DirectoryMonitor.c" +#line 8576 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashMap* _tmp7_ = NULL; - GeeSet* _tmp8_ = NULL; - GeeSet* _tmp9_ = NULL; - GeeSet* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; - GeeIterator* _tmp12_ = NULL; + GeeHashMap* _tmp7_; + GeeSet* _tmp8_; + GeeSet* _tmp9_; + GeeSet* _tmp10_; + GeeIterator* _tmp11_; + GeeIterator* _tmp12_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp7_ = self->priv->map; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -8991,31 +8605,31 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _file_it = _tmp12_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 8989 "DirectoryMonitor.c" - GeeIterator* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; +#line 8603 "DirectoryMonitor.c" + GeeIterator* _tmp13_; + gboolean _tmp14_; GFile* file = NULL; - GeeIterator* _tmp15_ = NULL; - gpointer _tmp16_ = NULL; + GeeIterator* _tmp15_; + gpointer _tmp16_; GFileInfo* info = NULL; - GeeHashMap* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - GFileInfo* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - gint64 _tmp25_ = 0LL; - GFileInfo* _tmp26_ = NULL; - gint64 _tmp27_ = 0LL; + GeeHashMap* _tmp17_; + GFile* _tmp18_; + gpointer _tmp19_; + GFileInfo* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + const gchar* _tmp23_; + gboolean _tmp24_; + gint64 _tmp25_; + GFileInfo* _tmp26_; + gint64 _tmp27_; GTimeVal time = {0}; - GFileInfo* _tmp28_ = NULL; + GFileInfo* _tmp28_; GTimeVal _tmp29_ = {0}; - GTimeVal _tmp30_ = {0}; - glong _tmp31_ = 0L; - GTimeVal _tmp32_ = {0}; - glong _tmp33_ = 0L; + GTimeVal _tmp30_; + glong _tmp31_; + GTimeVal _tmp32_; + glong _tmp33_; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = _file_it; #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9024,7 +8638,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn if (!_tmp14_) { #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9022 "DirectoryMonitor.c" +#line 8636 "DirectoryMonitor.c" } #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp15_ = _file_it; @@ -9064,7 +8678,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9062 "DirectoryMonitor.c" +#line 8676 "DirectoryMonitor.c" } #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp25_ = match_size; @@ -9080,7 +8694,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_object_unref0 (file); #line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9078 "DirectoryMonitor.c" +#line 8692 "DirectoryMonitor.c" } #line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = info; @@ -9104,7 +8718,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_object_unref0 (file); #line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9102 "DirectoryMonitor.c" +#line 8716 "DirectoryMonitor.c" } #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = file; @@ -9116,11 +8730,11 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9114 "DirectoryMonitor.c" +#line 8728 "DirectoryMonitor.c" } #line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9118 "DirectoryMonitor.c" +#line 8732 "DirectoryMonitor.c" } #line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = NULL; @@ -9128,13 +8742,13 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn _g_free0 (match_id); #line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9126 "DirectoryMonitor.c" +#line 8740 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, GFile* root, DirectoryMonitorFileInfoMap* descendents) { GeeArrayList* pruned = NULL; - GeeArrayList* _tmp28_ = NULL; + GeeArrayList* _tmp28_; #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self)); #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9143,15 +8757,15 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents)); #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = NULL; -#line 9141 "DirectoryMonitor.c" +#line 8755 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9170,15 +8784,15 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _file_it = _tmp5_; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9168 "DirectoryMonitor.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 8782 "DirectoryMonitor.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; GFile* file = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; GFile* parent = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; + GFile* _tmp10_; + GFile* _tmp11_; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _file_it; #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9187,7 +8801,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor if (!_tmp7_) { #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9185 "DirectoryMonitor.c" +#line 8799 "DirectoryMonitor.c" } #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _file_it; @@ -9203,20 +8817,20 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor parent = _tmp11_; #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9201 "DirectoryMonitor.c" - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - GFile* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; +#line 8815 "DirectoryMonitor.c" + GFile* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + gboolean _tmp15_; + GFile* _tmp26_; + GFile* _tmp27_; #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = parent; #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!(_tmp12_ != NULL)) { #line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9214 "DirectoryMonitor.c" +#line 8828 "DirectoryMonitor.c" } #line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp13_ = parent; @@ -9226,29 +8840,29 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _tmp15_ = g_file_equal (_tmp13_, _tmp14_); #line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp15_) { -#line 9224 "DirectoryMonitor.c" - GeeArrayList* _tmp16_ = NULL; - GeeArrayList* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - DirectoryMonitorFileInfoMap* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - GeeHashMap* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - gpointer _tmp24_ = NULL; - GFileInfo* _tmp25_ = NULL; +#line 8838 "DirectoryMonitor.c" + GeeArrayList* _tmp16_; + GeeArrayList* _tmp18_; + GFile* _tmp19_; + DirectoryMonitorFileInfoMap* _tmp20_; + GFile* _tmp21_; + GeeHashMap* _tmp22_; + GFile* _tmp23_; + gpointer _tmp24_; + GFileInfo* _tmp25_; #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp16_ = pruned; #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp16_ == NULL) { -#line 9238 "DirectoryMonitor.c" - GeeArrayList* _tmp17_ = NULL; +#line 8852 "DirectoryMonitor.c" + GeeArrayList* _tmp17_; #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); #line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" pruned = _tmp17_; -#line 9246 "DirectoryMonitor.c" +#line 8860 "DirectoryMonitor.c" } #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp18_ = pruned; @@ -9274,7 +8888,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _g_object_unref0 (_tmp25_); #line 329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9272 "DirectoryMonitor.c" +#line 8886 "DirectoryMonitor.c" } #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp26_ = parent; @@ -9284,33 +8898,33 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor _g_object_unref0 (parent); #line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" parent = _tmp27_; -#line 9282 "DirectoryMonitor.c" +#line 8896 "DirectoryMonitor.c" } #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9288 "DirectoryMonitor.c" +#line 8902 "DirectoryMonitor.c" } #line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9292 "DirectoryMonitor.c" +#line 8906 "DirectoryMonitor.c" } #line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp28_ = pruned; #line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp28_ != NULL) { -#line 9298 "DirectoryMonitor.c" - GeeArrayList* _tmp29_ = NULL; +#line 8912 "DirectoryMonitor.c" + GeeArrayList* _tmp29_; #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp29_ = pruned; #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 9304 "DirectoryMonitor.c" +#line 8918 "DirectoryMonitor.c" } #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); -#line 9308 "DirectoryMonitor.c" +#line 8922 "DirectoryMonitor.c" } @@ -9327,15 +8941,15 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0); #line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" count = 0; -#line 9325 "DirectoryMonitor.c" +#line 8939 "DirectoryMonitor.c" { GeeIterator* _file_it = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp0_ = self->priv->map; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9354,25 +8968,25 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _file_it = _tmp5_; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" while (TRUE) { -#line 9352 "DirectoryMonitor.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 8966 "DirectoryMonitor.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; GFile* file = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; GFile* parent = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; + GFile* _tmp10_; + GFile* _tmp11_; gboolean _tmp12_ = FALSE; - GFile* _tmp13_ = NULL; + GFile* _tmp13_; DirectoryMonitorFType ftype = 0; - GeeHashMap* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - GFileInfo* _tmp20_ = NULL; - DirectoryMonitorFType _tmp21_ = 0; - DirectoryMonitorFType _tmp22_ = 0; - DirectoryMonitorFType _tmp23_ = 0; + GeeHashMap* _tmp17_; + GFile* _tmp18_; + gpointer _tmp19_; + GFileInfo* _tmp20_; + DirectoryMonitorFType _tmp21_; + DirectoryMonitorFType _tmp22_; + DirectoryMonitorFType _tmp23_; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp6_ = _file_it; #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9381,7 +8995,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn if (!_tmp7_) { #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9379 "DirectoryMonitor.c" +#line 8993 "DirectoryMonitor.c" } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp8_ = _file_it; @@ -9401,11 +9015,11 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn if (_tmp13_ == NULL) { #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = TRUE; -#line 9399 "DirectoryMonitor.c" +#line 9013 "DirectoryMonitor.c" } else { - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GFile* _tmp14_; + GFile* _tmp15_; + gboolean _tmp16_; #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp14_ = parent; #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9414,7 +9028,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _tmp16_ = g_file_equal (_tmp14_, _tmp15_); #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp12_ = !_tmp16_; -#line 9412 "DirectoryMonitor.c" +#line 9026 "DirectoryMonitor.c" } #line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (_tmp12_) { @@ -9424,7 +9038,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn _g_object_unref0 (file); #line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" continue; -#line 9422 "DirectoryMonitor.c" +#line 9036 "DirectoryMonitor.c" } #line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp17_ = self->priv->map; @@ -9448,11 +9062,11 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn switch (_tmp23_) { #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_FILE: -#line 9446 "DirectoryMonitor.c" +#line 9060 "DirectoryMonitor.c" { - GeeCollection* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gint _tmp26_ = 0; + GeeCollection* _tmp24_; + GFile* _tmp25_; + gint _tmp26_; #line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp24_ = files; #line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9465,15 +9079,15 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn count = _tmp26_ + 1; #line 354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9463 "DirectoryMonitor.c" +#line 9077 "DirectoryMonitor.c" } #line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" case DIRECTORY_MONITOR_FTYPE_DIRECTORY: -#line 9467 "DirectoryMonitor.c" +#line 9081 "DirectoryMonitor.c" { - GeeCollection* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - gint _tmp29_ = 0; + GeeCollection* _tmp27_; + GFile* _tmp28_; + gint _tmp29_; #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp27_ = dirs; #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9486,42 +9100,42 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn count = _tmp29_ + 1; #line 359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9484 "DirectoryMonitor.c" +#line 9098 "DirectoryMonitor.c" } default: { - DirectoryMonitorFType _tmp30_ = 0; + DirectoryMonitorFType _tmp30_; #line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _tmp30_ = ftype; #line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED"); #line 363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" break; -#line 9495 "DirectoryMonitor.c" +#line 9109 "DirectoryMonitor.c" } } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (parent); #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (file); -#line 9502 "DirectoryMonitor.c" +#line 9116 "DirectoryMonitor.c" } #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_file_it); -#line 9506 "DirectoryMonitor.c" +#line 9120 "DirectoryMonitor.c" } #line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" result = count; #line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return result; -#line 9512 "DirectoryMonitor.c" +#line 9126 "DirectoryMonitor.c" } static void directory_monitor_value_file_info_map_init (GValue* value) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9519 "DirectoryMonitor.c" +#line 9133 "DirectoryMonitor.c" } @@ -9530,7 +9144,7 @@ static void directory_monitor_value_file_info_map_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (value->data[0].v_pointer); -#line 9528 "DirectoryMonitor.c" +#line 9142 "DirectoryMonitor.c" } } @@ -9540,11 +9154,11 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_ if (src_value->data[0].v_pointer) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = directory_monitor_file_info_map_ref (src_value->data[0].v_pointer); -#line 9538 "DirectoryMonitor.c" +#line 9152 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" dest_value->data[0].v_pointer = NULL; -#line 9542 "DirectoryMonitor.c" +#line 9156 "DirectoryMonitor.c" } } @@ -9552,66 +9166,66 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_ static gpointer directory_monitor_value_file_info_map_peek_pointer (const GValue* value) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9550 "DirectoryMonitor.c" +#line 9164 "DirectoryMonitor.c" } static gchar* directory_monitor_value_file_info_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (collect_values[0].v_pointer) { -#line 9557 "DirectoryMonitor.c" - DirectoryMonitorFileInfoMap* object; +#line 9171 "DirectoryMonitor.c" + DirectoryMonitorFileInfoMap * object; object = collect_values[0].v_pointer; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (object->parent_instance.g_class == NULL) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9564 "DirectoryMonitor.c" +#line 9178 "DirectoryMonitor.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 9568 "DirectoryMonitor.c" +#line 9182 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = directory_monitor_file_info_map_ref (object); -#line 9572 "DirectoryMonitor.c" +#line 9186 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9576 "DirectoryMonitor.c" +#line 9190 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9580 "DirectoryMonitor.c" +#line 9194 "DirectoryMonitor.c" } static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DirectoryMonitorFileInfoMap** object_p; + DirectoryMonitorFileInfoMap ** object_p; object_p = collect_values[0].v_pointer; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!object_p) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9591 "DirectoryMonitor.c" +#line 9205 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (!value->data[0].v_pointer) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = NULL; -#line 9597 "DirectoryMonitor.c" +#line 9211 "DirectoryMonitor.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = value->data[0].v_pointer; -#line 9601 "DirectoryMonitor.c" +#line 9215 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" *object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9605 "DirectoryMonitor.c" +#line 9219 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return NULL; -#line 9609 "DirectoryMonitor.c" +#line 9223 "DirectoryMonitor.c" } @@ -9625,7 +9239,7 @@ static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name G_PARAM_SPEC (spec)->value_type = object_type; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return G_PARAM_SPEC (spec); -#line 9623 "DirectoryMonitor.c" +#line 9237 "DirectoryMonitor.c" } @@ -9634,12 +9248,12 @@ static gpointer directory_monitor_value_get_file_info_map (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return value->data[0].v_pointer; -#line 9632 "DirectoryMonitor.c" +#line 9246 "DirectoryMonitor.c" } static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v_object) { - DirectoryMonitorFileInfoMap* old; + DirectoryMonitorFileInfoMap * old; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9654,23 +9268,23 @@ static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v value->data[0].v_pointer = v_object; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_ref (value->data[0].v_pointer); -#line 9652 "DirectoryMonitor.c" +#line 9266 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9656 "DirectoryMonitor.c" +#line 9270 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9662 "DirectoryMonitor.c" +#line 9276 "DirectoryMonitor.c" } } static void directory_monitor_value_take_file_info_map (GValue* value, gpointer v_object) { - DirectoryMonitorFileInfoMap* old; + DirectoryMonitorFileInfoMap * old; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP)); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9683,17 +9297,17 @@ static void directory_monitor_value_take_file_info_map (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = v_object; -#line 9681 "DirectoryMonitor.c" +#line 9295 "DirectoryMonitor.c" } else { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" value->data[0].v_pointer = NULL; -#line 9685 "DirectoryMonitor.c" +#line 9299 "DirectoryMonitor.c" } #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (old) { #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" directory_monitor_file_info_map_unref (old); -#line 9691 "DirectoryMonitor.c" +#line 9305 "DirectoryMonitor.c" } } @@ -9705,13 +9319,13 @@ static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfo ((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate)); -#line 9703 "DirectoryMonitor.c" +#line 9317 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileInfoMap * self) { - GeeHashMap* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; + GeeHashMap* _tmp0_; + GeeHashMap* _tmp1_; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self); #line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9724,11 +9338,11 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI self->priv->id_map = _tmp1_; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->ref_count = 1; -#line 9722 "DirectoryMonitor.c" +#line 9336 "DirectoryMonitor.c" } -static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap* obj) { +static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap * obj) { DirectoryMonitorFileInfoMap * self; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMap); @@ -9738,7 +9352,7 @@ static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMa _g_object_unref0 (self->priv->map); #line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (self->priv->id_map); -#line 9736 "DirectoryMonitor.c" +#line 9350 "DirectoryMonitor.c" } @@ -9757,18 +9371,18 @@ static GType directory_monitor_file_info_map_get_type (void) { static gpointer directory_monitor_file_info_map_ref (gpointer instance) { - DirectoryMonitorFileInfoMap* self; + DirectoryMonitorFileInfoMap * self; self = instance; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_atomic_int_inc (&self->ref_count); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" return instance; -#line 9761 "DirectoryMonitor.c" +#line 9375 "DirectoryMonitor.c" } static void directory_monitor_file_info_map_unref (gpointer instance) { - DirectoryMonitorFileInfoMap* self; + DirectoryMonitorFileInfoMap * self; self = instance; #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -9776,7 +9390,7 @@ static void directory_monitor_file_info_map_unref (gpointer instance) { DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self); #line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9774 "DirectoryMonitor.c" +#line 9388 "DirectoryMonitor.c" } } @@ -9787,51 +9401,51 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_type_class_add_private (klass, sizeof (DirectoryMonitorPrivate)); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_root_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_root_deleted; + ((DirectoryMonitorClass *) klass)->notify_root_deleted = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_root_deleted; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_root_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_root_moved; + ((DirectoryMonitorClass *) klass)->notify_root_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_root_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_discovery_started = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_discovery_started; + ((DirectoryMonitorClass *) klass)->notify_discovery_started = (void (*) (DirectoryMonitor *)) directory_monitor_real_notify_discovery_started; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->internal_notify_file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_file_discovered; + ((DirectoryMonitorClass *) klass)->internal_notify_file_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_file_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_discovered; + ((DirectoryMonitorClass *) klass)->notify_file_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_file_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->internal_notify_directory_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_directory_discovered; + ((DirectoryMonitorClass *) klass)->internal_notify_directory_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_internal_notify_directory_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_discovered = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_discovered; + ((DirectoryMonitorClass *) klass)->notify_directory_discovered = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_discovered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_discovery_failed = (void (*)(DirectoryMonitor*, const gchar*)) directory_monitor_real_notify_discovery_failed; + ((DirectoryMonitorClass *) klass)->notify_discovery_failed = (void (*) (DirectoryMonitor *, const gchar*)) directory_monitor_real_notify_discovery_failed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_discovery_completed = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_discovery_completed; + ((DirectoryMonitorClass *) klass)->notify_discovery_completed = (void (*) (DirectoryMonitor *)) directory_monitor_real_notify_discovery_completed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_created; + ((DirectoryMonitorClass *) klass)->notify_file_created = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_file_created; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_moved; + ((DirectoryMonitorClass *) klass)->notify_file_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_altered; + ((DirectoryMonitorClass *) klass)->notify_file_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_file_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_file_alteration_completed; + ((DirectoryMonitorClass *) klass)->notify_file_alteration_completed = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_file_alteration_completed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_attributes_altered; + ((DirectoryMonitorClass *) klass)->notify_file_attributes_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_file_attributes_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_file_deleted; + ((DirectoryMonitorClass *) klass)->notify_file_deleted = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_file_deleted; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_created = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_created; + ((DirectoryMonitorClass *) klass)->notify_directory_created = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_created; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_moved = (void (*)(DirectoryMonitor*, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_moved; + ((DirectoryMonitorClass *) klass)->notify_directory_moved = (void (*) (DirectoryMonitor *, GFile*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_altered; + ((DirectoryMonitorClass *) klass)->notify_directory_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_directory_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_alteration_completed = (void (*)(DirectoryMonitor*, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_alteration_completed; + ((DirectoryMonitorClass *) klass)->notify_directory_alteration_completed = (void (*) (DirectoryMonitor *, GFile*, GFileInfo*)) directory_monitor_real_notify_directory_alteration_completed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_attributes_altered = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_attributes_altered; + ((DirectoryMonitorClass *) klass)->notify_directory_attributes_altered = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_directory_attributes_altered; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_directory_deleted = (void (*)(DirectoryMonitor*, GFile*)) directory_monitor_real_notify_directory_deleted; + ((DirectoryMonitorClass *) klass)->notify_directory_deleted = (void (*) (DirectoryMonitor *, GFile*)) directory_monitor_real_notify_directory_deleted; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->notify_closed = (void (*)(DirectoryMonitor*)) directory_monitor_real_notify_closed; + ((DirectoryMonitorClass *) klass)->notify_closed = (void (*) (DirectoryMonitor *)) directory_monitor_real_notify_closed; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - ((DirectoryMonitorClass *) klass)->close = (void (*)(DirectoryMonitor*)) directory_monitor_real_close; + ((DirectoryMonitorClass *) klass)->close = (void (*) (DirectoryMonitor *)) directory_monitor_real_close; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" ((DirectoryMonitorClass *) klass)->root_moved = directory_monitor_real_root_moved; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9875,55 +9489,55 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_OBJECT_CLASS (klass)->finalize = directory_monitor_finalize; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_ROOT_MOVED_SIGNAL] = g_signal_new ("root-moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_ROOT_DELETED_SIGNAL] = g_signal_new ("root-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("discovery_started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_STARTED_SIGNAL] = g_signal_new ("discovery-started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_DISCOVERED_SIGNAL] = g_signal_new ("file-discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DISCOVERED_SIGNAL] = g_signal_new ("directory-discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("discovery_failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_FAILED_SIGNAL] = g_signal_new ("discovery-failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("discovery_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + directory_monitor_signals[DIRECTORY_MONITOR_DISCOVERY_COMPLETED_SIGNAL] = g_signal_new ("discovery-completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_CREATED_SIGNAL] = g_signal_new ("file-created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_MOVED_SIGNAL] = g_signal_new ("file-moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERED_SIGNAL] = g_signal_new ("file-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_ALTERATION_COMPLETED_SIGNAL] = g_signal_new ("file-alteration-completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_ATTRIBUTES_ALTERED_SIGNAL] = g_signal_new ("file-attributes-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_FILE_DELETED_SIGNAL] = g_signal_new ("file-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_CREATED_SIGNAL] = g_signal_new ("directory-created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_MOVED_SIGNAL] = g_signal_new ("directory-moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERED_SIGNAL] = g_signal_new ("directory-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ALTERATION_COMPLETED_SIGNAL] = g_signal_new ("directory-alteration-completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_ATTRIBUTES_ALTERED_SIGNAL] = g_signal_new ("directory-attributes-altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); + directory_monitor_signals[DIRECTORY_MONITOR_DIRECTORY_DELETED_SIGNAL] = g_signal_new ("directory-deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9912 "DirectoryMonitor.c" + directory_monitor_signals[DIRECTORY_MONITOR_CLOSED_SIGNAL] = g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 9526 "DirectoryMonitor.c" } static void directory_monitor_instance_init (DirectoryMonitor * self) { - GeeHashMap* _tmp0_ = NULL; - GeeLinkedList* _tmp1_ = NULL; - DirectoryMonitorFileInfoMap* _tmp2_ = NULL; - DirectoryMonitorFileInfoMap* _tmp3_ = NULL; - GCancellable* _tmp4_ = NULL; + GeeHashMap* _tmp0_; + GeeLinkedList* _tmp1_; + DirectoryMonitorFileInfoMap* _tmp2_; + DirectoryMonitorFileInfoMap* _tmp3_; + GCancellable* _tmp4_; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_GET_PRIVATE (self); #line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9954,11 +9568,11 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) { self->priv->has_discovery_started = FALSE; #line 383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->delete_timer_id = (guint) 0; -#line 9952 "DirectoryMonitor.c" +#line 9566 "DirectoryMonitor.c" } -static void directory_monitor_finalize (GObject* obj) { +static void directory_monitor_finalize (GObject * obj) { DirectoryMonitor * self; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECTORY_MONITOR, DirectoryMonitor); @@ -9976,7 +9590,7 @@ static void directory_monitor_finalize (GObject* obj) { _g_object_unref0 (self->priv->cancellable); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_OBJECT_CLASS (directory_monitor_parent_class)->finalize (obj); -#line 9974 "DirectoryMonitor.c" +#line 9588 "DirectoryMonitor.c" } |