From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/MediaMonitor.c | 775 ++++++++++++++++++++++++++--------------------------- 1 file changed, 386 insertions(+), 389 deletions(-) (limited to 'src/MediaMonitor.c') diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c index 6bf6a2d..b06e19e 100644 --- a/src/MediaMonitor.c +++ b/src/MediaMonitor.c @@ -1,4 +1,4 @@ -/* MediaMonitor.c generated by valac 0.34.7, the Vala compiler +/* MediaMonitor.c generated by valac 0.36.6, the Vala compiler * generated from MediaMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -242,7 +242,7 @@ struct _MediaMonitorClass { MonitorableUpdates* (*create_updates) (MediaMonitor* self, Monitorable* monitorable); void (*on_media_source_destroyed) (MediaMonitor* self, DataSource* source); void (*notify_discovery_started) (MediaMonitor* self); - MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable); + MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); GeeCollection* (*candidates_for_unknown_file) (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); GFile** (*get_auxilliary_backing_files) (MediaMonitor* self, Monitorable* monitorable, int* result_length1); void (*update_backing_file_info) (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info); @@ -319,7 +319,7 @@ void monitorable_updates_reset_online_offline (MonitorableUpdates* self); static void monitorable_updates_real_reset_online_offline (MonitorableUpdates* self); gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self); static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* self); -static void monitorable_updates_finalize (MonitorableUpdates* obj); +static void monitorable_updates_finalize (MonitorableUpdates * obj); GType media_monitor_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); @@ -364,8 +364,8 @@ static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, Da void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable); void media_monitor_notify_discovery_started (MediaMonitor* self); static void media_monitor_real_notify_discovery_started (MediaMonitor* self); -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable); -static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable); +MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); +static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable); GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); static GeeCollection* media_monitor_real_candidates_for_unknown_file (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_); GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1); @@ -418,7 +418,7 @@ void transaction_controller_commit (TransactionController* self); GQuark database_error_quark (void); void app_window_database_error (GError* err); void app_window_panic (const gchar* msg); -static void media_monitor_finalize (GObject* obj); +static void media_monitor_finalize (GObject * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -430,8 +430,8 @@ static gpointer _g_object_ref0 (gpointer self) { MonitorableUpdates* monitorable_updates_construct (GType object_type, Monitorable* monitorable) { MonitorableUpdates* self = NULL; - Monitorable* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; + Monitorable* _tmp0_; + Monitorable* _tmp1_; #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 17 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -459,8 +459,8 @@ MonitorableUpdates* monitorable_updates_new (Monitorable* monitorable) { GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 21 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), NULL); #line 22 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -477,8 +477,8 @@ GFile* monitorable_updates_get_master_file (MonitorableUpdates* self) { GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) { GFileInfo* result = NULL; - GFileInfo* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; + GFileInfo* _tmp0_; + GFileInfo* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), NULL); #line 26 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -495,7 +495,7 @@ GFileInfo* monitorable_updates_get_master_file_info (MonitorableUpdates* self) { static gboolean monitorable_updates_real_is_in_alteration (MonitorableUpdates* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = self->priv->master_in_alteration; #line 30 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -517,7 +517,7 @@ gboolean monitorable_updates_is_in_alteration (MonitorableUpdates* self) { gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 33 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE); #line 34 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -532,7 +532,7 @@ gboolean monitorable_updates_is_set_offline (MonitorableUpdates* self) { gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 37 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE_UPDATES (self), FALSE); #line 38 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -546,9 +546,9 @@ gboolean monitorable_updates_is_set_online (MonitorableUpdates* self) { static void monitorable_updates_real_set_master_file (MonitorableUpdates* self, GFile* file) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((file == NULL) || G_IS_FILE (file)); #line 42 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -580,8 +580,8 @@ void monitorable_updates_set_master_file (MonitorableUpdates* self, GFile* file) static void monitorable_updates_real_set_master_file_info_altered (MonitorableUpdates* self, gboolean altered) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; #line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = altered; #line 49 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -607,9 +607,9 @@ void monitorable_updates_set_master_file_info_altered (MonitorableUpdates* self, static void monitorable_updates_real_set_master_file_info (MonitorableUpdates* self, GFileInfo* info) { - GFileInfo* _tmp0_ = NULL; - GFileInfo* _tmp1_ = NULL; - GFileInfo* _tmp2_ = NULL; + GFileInfo* _tmp0_; + GFileInfo* _tmp1_; + GFileInfo* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info)); #line 56 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -641,7 +641,7 @@ void monitorable_updates_set_master_file_info (MonitorableUpdates* self, GFileIn static void monitorable_updates_real_set_master_in_alteration (MonitorableUpdates* self, gboolean in_alteration) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = in_alteration; #line 63 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -660,7 +660,7 @@ void monitorable_updates_set_master_in_alteration (MonitorableUpdates* self, gbo static void monitorable_updates_real_set_master_alterations_complete (MonitorableUpdates* self, GFileInfo* info) { - GFileInfo* _tmp0_ = NULL; + GFileInfo* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 67 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -753,13 +753,13 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - GFile* _tmp5_ = NULL; + GFile* _tmp5_; #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp5_ = self->priv->master_file; #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp5_ == NULL) { #line 762 "MediaMonitor.c" - gboolean _tmp6_ = FALSE; + gboolean _tmp6_; #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp6_ = self->priv->master_file_info_altered; #line 93 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -773,7 +773,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp4_) { #line 776 "MediaMonitor.c" - GFileInfo* _tmp7_ = NULL; + GFileInfo* _tmp7_; #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp7_ = self->priv->master_file_info; #line 94 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -787,7 +787,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp3_) { #line 790 "MediaMonitor.c" - gboolean _tmp8_ = FALSE; + gboolean _tmp8_; #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp8_ = self->priv->master_in_alteration; #line 95 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -801,7 +801,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp2_) { #line 804 "MediaMonitor.c" - gboolean _tmp9_ = FALSE; + gboolean _tmp9_; #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp9_ = self->priv->online; #line 96 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -815,7 +815,7 @@ static gboolean monitorable_updates_real_is_all_updated (MonitorableUpdates* sel #line 92 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp1_) { #line 818 "MediaMonitor.c" - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp10_ = self->priv->offline; #line 97 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -885,7 +885,7 @@ static gchar* value_monitorable_updates_collect_value (GValue* value, guint n_co #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (collect_values[0].v_pointer) { #line 888 "MediaMonitor.c" - MonitorableUpdates* object; + MonitorableUpdates * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (object->parent_instance.g_class == NULL) { @@ -912,7 +912,7 @@ static gchar* value_monitorable_updates_collect_value (GValue* value, guint n_co static gchar* value_monitorable_updates_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - MonitorableUpdates** object_p; + MonitorableUpdates ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (!object_p) { @@ -964,7 +964,7 @@ gpointer value_get_monitorable_updates (const GValue* value) { void value_set_monitorable_updates (GValue* value, gpointer v_object) { - MonitorableUpdates* old; + MonitorableUpdates * old; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES)); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -995,7 +995,7 @@ void value_set_monitorable_updates (GValue* value, gpointer v_object) { void value_take_monitorable_updates (GValue* value, gpointer v_object) { - MonitorableUpdates* old; + MonitorableUpdates * old; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MONITORABLE_UPDATES)); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1031,25 +1031,25 @@ static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) { #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_type_class_add_private (klass, sizeof (MonitorableUpdatesPrivate)); #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_in_alteration; + ((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*) (MonitorableUpdates *)) monitorable_updates_real_is_in_alteration; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->set_master_file = (void (*)(MonitorableUpdates*, GFile*)) monitorable_updates_real_set_master_file; + ((MonitorableUpdatesClass *) klass)->set_master_file = (void (*) (MonitorableUpdates *, GFile*)) monitorable_updates_real_set_master_file; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->set_master_file_info_altered = (void (*)(MonitorableUpdates*, gboolean)) monitorable_updates_real_set_master_file_info_altered; + ((MonitorableUpdatesClass *) klass)->set_master_file_info_altered = (void (*) (MonitorableUpdates *, gboolean)) monitorable_updates_real_set_master_file_info_altered; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->set_master_file_info = (void (*)(MonitorableUpdates*, GFileInfo*)) monitorable_updates_real_set_master_file_info; + ((MonitorableUpdatesClass *) klass)->set_master_file_info = (void (*) (MonitorableUpdates *, GFileInfo*)) monitorable_updates_real_set_master_file_info; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->set_master_in_alteration = (void (*)(MonitorableUpdates*, gboolean)) monitorable_updates_real_set_master_in_alteration; + ((MonitorableUpdatesClass *) klass)->set_master_in_alteration = (void (*) (MonitorableUpdates *, gboolean)) monitorable_updates_real_set_master_in_alteration; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->set_master_alterations_complete = (void (*)(MonitorableUpdates*, GFileInfo*)) monitorable_updates_real_set_master_alterations_complete; + ((MonitorableUpdatesClass *) klass)->set_master_alterations_complete = (void (*) (MonitorableUpdates *, GFileInfo*)) monitorable_updates_real_set_master_alterations_complete; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->mark_offline = (void (*)(MonitorableUpdates*)) monitorable_updates_real_mark_offline; + ((MonitorableUpdatesClass *) klass)->mark_offline = (void (*) (MonitorableUpdates *)) monitorable_updates_real_mark_offline; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->mark_online = (void (*)(MonitorableUpdates*)) monitorable_updates_real_mark_online; + ((MonitorableUpdatesClass *) klass)->mark_online = (void (*) (MonitorableUpdates *)) monitorable_updates_real_mark_online; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*)(MonitorableUpdates*)) monitorable_updates_real_reset_online_offline; + ((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*) (MonitorableUpdates *)) monitorable_updates_real_reset_online_offline; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_all_updated; + ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) monitorable_updates_real_is_all_updated; #line 1054 "MediaMonitor.c" } @@ -1075,7 +1075,7 @@ static void monitorable_updates_instance_init (MonitorableUpdates * self) { } -static void monitorable_updates_finalize (MonitorableUpdates* obj) { +static void monitorable_updates_finalize (MonitorableUpdates * obj) { MonitorableUpdates * self; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MONITORABLE_UPDATES, MonitorableUpdates); @@ -1106,7 +1106,7 @@ GType monitorable_updates_get_type (void) { gpointer monitorable_updates_ref (gpointer instance) { - MonitorableUpdates* self; + MonitorableUpdates * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_atomic_int_inc (&self->ref_count); @@ -1117,7 +1117,7 @@ gpointer monitorable_updates_ref (gpointer instance) { void monitorable_updates_unref (gpointer instance) { - MonitorableUpdates* self; + MonitorableUpdates * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1174,13 +1174,13 @@ static gboolean _media_monitor_on_flush_pending_updates_gsource_func (gpointer s MediaMonitor* media_monitor_construct (GType object_type, MediaSourceCollection* sources, GCancellable* cancellable) { MediaMonitor * self = NULL; - MediaSourceCollection* _tmp0_ = NULL; - MediaSourceCollection* _tmp1_ = NULL; - GCancellable* _tmp2_ = NULL; - GCancellable* _tmp3_ = NULL; - MediaSourceCollection* _tmp4_ = NULL; - MediaSourceCollection* _tmp5_ = NULL; - guint _tmp6_ = 0U; + MediaSourceCollection* _tmp0_; + MediaSourceCollection* _tmp1_; + GCancellable* _tmp2_; + GCancellable* _tmp3_; + MediaSourceCollection* _tmp4_; + MediaSourceCollection* _tmp5_; + guint _tmp6_; #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 118 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1254,12 +1254,12 @@ void media_monitor_close (MediaMonitor* self) { static gchar* media_monitor_real_to_string (MediaMonitor* self) { gchar* result = NULL; - MediaSourceCollection* _tmp0_ = NULL; - MediaSourceCollection* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + MediaSourceCollection* _tmp0_; + MediaSourceCollection* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 140 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = media_monitor_get_media_source_collection (self); #line 140 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1295,8 +1295,8 @@ gchar* media_monitor_to_string (MediaMonitor* self) { static MonitorableUpdates* media_monitor_real_create_updates (MediaMonitor* self, Monitorable* monitorable) { MonitorableUpdates* result = NULL; - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; #line 143 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 144 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1321,7 +1321,7 @@ MonitorableUpdates* media_monitor_create_updates (MediaMonitor* self, Monitorabl static void media_monitor_real_on_media_source_destroyed (MediaMonitor* self, DataSource* source) { - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 147 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 148 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1354,7 +1354,7 @@ void media_monitor_notify_discovery_started (MediaMonitor* self) { } -static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable) { +static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) { #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_discovered'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1363,7 +1363,7 @@ static MediaMonitorDiscoveredFile media_monitor_real_notify_file_discovered (Med } -MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable) { +MediaMonitorDiscoveredFile media_monitor_notify_file_discovered (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable) { #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), 0); #line 160 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1392,8 +1392,8 @@ GeeCollection* media_monitor_candidates_for_unknown_file (MediaMonitor* self, GF static GFile** media_monitor_real_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1) { GFile** result = NULL; - GFile** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GFile** _tmp0_; + gint _tmp0__length1; #line 172 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL); #line 173 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1598,9 +1598,9 @@ void media_monitor_mdbg (const gchar* msg) { gboolean media_monitor_has_pending_updates (MediaMonitor* self) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeHashMap* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 209 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1619,9 +1619,9 @@ gboolean media_monitor_has_pending_updates (MediaMonitor* self) { GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) { GeeCollection* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 213 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1641,15 +1641,15 @@ GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) { MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable* monitorable) { MonitorableUpdates* result = NULL; MonitorableUpdates* updates = NULL; - GeeHashMap* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - MonitorableUpdates* _tmp3_ = NULL; - Monitorable* _tmp4_ = NULL; - MonitorableUpdates* _tmp5_ = NULL; - GeeHashMap* _tmp6_ = NULL; - Monitorable* _tmp7_ = NULL; - MonitorableUpdates* _tmp8_ = NULL; + GeeHashMap* _tmp0_; + Monitorable* _tmp1_; + gpointer _tmp2_; + MonitorableUpdates* _tmp3_; + Monitorable* _tmp4_; + MonitorableUpdates* _tmp5_; + GeeHashMap* _tmp6_; + Monitorable* _tmp7_; + MonitorableUpdates* _tmp8_; #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 219 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1698,9 +1698,9 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Monitorable* monitorable) { MonitorableUpdates* result = NULL; - GeeHashMap* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + Monitorable* _tmp1_; + gpointer _tmp2_; #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 230 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1720,8 +1720,8 @@ MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Moni void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) { - GeeHashMap* _tmp0_ = NULL; - Monitorable* _tmp1_ = NULL; + GeeHashMap* _tmp0_; + Monitorable* _tmp1_; #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 234 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1739,10 +1739,10 @@ void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable) gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) { gboolean result = FALSE; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; gboolean _tmp2_ = FALSE; - MonitorableUpdates* _tmp3_ = NULL; + MonitorableUpdates* _tmp3_; #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 238 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1758,8 +1758,8 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp3_ != NULL) { #line 1761 "MediaMonitor.c" - MonitorableUpdates* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + MonitorableUpdates* _tmp4_; + gboolean _tmp5_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp4_ = updates; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1768,8 +1768,8 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) _tmp2_ = _tmp5_; #line 1770 "MediaMonitor.c" } else { - Monitorable* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + Monitorable* _tmp6_; + gboolean _tmp7_; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp6_ = monitorable; #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1791,10 +1791,10 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable) gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) { gboolean result = FALSE; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; gboolean _tmp2_ = FALSE; - MonitorableUpdates* _tmp3_ = NULL; + MonitorableUpdates* _tmp3_; #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); #line 244 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1810,8 +1810,8 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp3_ != NULL) { #line 1813 "MediaMonitor.c" - MonitorableUpdates* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + MonitorableUpdates* _tmp4_; + gboolean _tmp5_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp4_ = updates; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1820,8 +1820,8 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) _tmp2_ = _tmp5_; #line 1822 "MediaMonitor.c" } else { - Monitorable* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + Monitorable* _tmp6_; + gboolean _tmp7_; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp6_ = monitorable; #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1843,11 +1843,11 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable) GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable) { GFile* result = NULL; MonitorableUpdates* updates = NULL; - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; GFile* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; - MonitorableUpdates* _tmp4_ = NULL; + MonitorableUpdates* _tmp4_; #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), NULL); #line 250 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1863,9 +1863,9 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp4_ != NULL) { #line 1866 "MediaMonitor.c" - MonitorableUpdates* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; + MonitorableUpdates* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp5_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1885,8 +1885,8 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp3_) { #line 1888 "MediaMonitor.c" - MonitorableUpdates* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; + MonitorableUpdates* _tmp8_; + GFile* _tmp9_; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp8_ = updates; #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1897,8 +1897,8 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab _tmp2_ = _tmp9_; #line 1899 "MediaMonitor.c" } else { - Monitorable* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; + Monitorable* _tmp10_; + GFile* _tmp11_; #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp10_ = monitorable; #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1920,10 +1920,10 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitorable, GFile* file) { - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; - MonitorableUpdates* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp2_; + GFile* _tmp3_; #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 257 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1947,9 +1947,9 @@ void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitora void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; - MonitorableUpdates* _tmp2_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp2_; #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 261 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1969,10 +1969,10 @@ void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitora void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitorable* monitorable, gboolean in_alteration) { - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; - MonitorableUpdates* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp2_; + gboolean _tmp3_; #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 265 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -1994,10 +1994,10 @@ void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitor void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, Monitorable* monitorable, GFileInfo* info) { - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; - MonitorableUpdates* _tmp2_ = NULL; - GFileInfo* _tmp3_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp2_; + GFileInfo* _tmp3_; #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 269 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2021,9 +2021,9 @@ void media_monitor_update_master_file_alterations_completed (MediaMonitor* self, void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; - MonitorableUpdates* _tmp2_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp2_; #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 273 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2043,9 +2043,9 @@ void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable) void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable) { - Monitorable* _tmp0_ = NULL; - MonitorableUpdates* _tmp1_ = NULL; - MonitorableUpdates* _tmp2_ = NULL; + Monitorable* _tmp0_; + MonitorableUpdates* _tmp1_; + MonitorableUpdates* _tmp2_; #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (IS_MEDIA_MONITOR (self)); #line 277 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2069,10 +2069,10 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio GeeMap* set_master_file_info = NULL; GeeArrayList* to_offline = NULL; GeeArrayList* to_online = NULL; - GeeMap* _tmp53_ = NULL; - GeeMap* _tmp63_ = NULL; + GeeMap* _tmp53_; + GeeMap* _tmp63_; gboolean _tmp73_ = FALSE; - GeeArrayList* _tmp74_ = NULL; + GeeArrayList* _tmp74_; GError * _inner_error_ = NULL; #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_if_fail (GEE_IS_COLLECTION (all_updates)); @@ -2089,8 +2089,8 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 2090 "MediaMonitor.c" { GeeIterator* _updates_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp0_ = all_updates; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2100,24 +2100,24 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { #line 2103 "MediaMonitor.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GeeIterator* _tmp2_; + gboolean _tmp3_; MonitorableUpdates* updates = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - gint _tmp6_ = 0; - MonitorableUpdates* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - MonitorableUpdates* _tmp21_ = NULL; - GFileInfo* _tmp22_ = NULL; - GFileInfo* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - MonitorableUpdates* _tmp35_ = NULL; - gboolean _tmp36_ = FALSE; - MonitorableUpdates* _tmp44_ = NULL; - gboolean _tmp45_ = FALSE; + GeeIterator* _tmp4_; + gpointer _tmp5_; + gint _tmp6_; + MonitorableUpdates* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; + MonitorableUpdates* _tmp21_; + GFileInfo* _tmp22_; + GFileInfo* _tmp23_; + gboolean _tmp24_; + MonitorableUpdates* _tmp35_; + gboolean _tmp36_; + MonitorableUpdates* _tmp44_; + gboolean _tmp45_; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp2_ = _updates_it; #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2157,21 +2157,21 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp10_) { #line 2160 "MediaMonitor.c" - GeeMap* _tmp11_ = NULL; - GeeMap* _tmp13_ = NULL; - MonitorableUpdates* _tmp14_ = NULL; - Monitorable* _tmp15_ = NULL; - MonitorableUpdates* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - MonitorableUpdates* _tmp19_ = NULL; - gint _tmp20_ = 0; + GeeMap* _tmp11_; + GeeMap* _tmp13_; + MonitorableUpdates* _tmp14_; + Monitorable* _tmp15_; + MonitorableUpdates* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + MonitorableUpdates* _tmp19_; + gint _tmp20_; #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp11_ = set_master_file; #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp11_ == NULL) { #line 2174 "MediaMonitor.c" - GeeHashMap* _tmp12_ = NULL; + GeeHashMap* _tmp12_; #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2219,21 +2219,21 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp24_) { #line 2222 "MediaMonitor.c" - GeeMap* _tmp25_ = NULL; - GeeMap* _tmp27_ = NULL; - MonitorableUpdates* _tmp28_ = NULL; - Monitorable* _tmp29_ = NULL; - MonitorableUpdates* _tmp30_ = NULL; - GFileInfo* _tmp31_ = NULL; - GFileInfo* _tmp32_ = NULL; - MonitorableUpdates* _tmp33_ = NULL; - gint _tmp34_ = 0; + GeeMap* _tmp25_; + GeeMap* _tmp27_; + MonitorableUpdates* _tmp28_; + Monitorable* _tmp29_; + MonitorableUpdates* _tmp30_; + GFileInfo* _tmp31_; + GFileInfo* _tmp32_; + MonitorableUpdates* _tmp33_; + gint _tmp34_; #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp25_ = set_master_file_info; #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp25_ == NULL) { #line 2236 "MediaMonitor.c" - GeeHashMap* _tmp26_ = NULL; + GeeHashMap* _tmp26_; #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2275,18 +2275,18 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp36_) { #line 2278 "MediaMonitor.c" - GeeArrayList* _tmp37_ = NULL; - GeeArrayList* _tmp39_ = NULL; - MonitorableUpdates* _tmp40_ = NULL; - Monitorable* _tmp41_ = NULL; - MonitorableUpdates* _tmp42_ = NULL; - gint _tmp43_ = 0; + GeeArrayList* _tmp37_; + GeeArrayList* _tmp39_; + MonitorableUpdates* _tmp40_; + Monitorable* _tmp41_; + MonitorableUpdates* _tmp42_; + gint _tmp43_; #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp37_ = to_offline; #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp37_ == NULL) { #line 2289 "MediaMonitor.c" - GeeArrayList* _tmp38_ = NULL; + GeeArrayList* _tmp38_; #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2320,18 +2320,18 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp45_) { #line 2323 "MediaMonitor.c" - GeeArrayList* _tmp46_ = NULL; - GeeArrayList* _tmp48_ = NULL; - MonitorableUpdates* _tmp49_ = NULL; - Monitorable* _tmp50_ = NULL; - MonitorableUpdates* _tmp51_ = NULL; - gint _tmp52_ = 0; + GeeArrayList* _tmp46_; + GeeArrayList* _tmp48_; + MonitorableUpdates* _tmp49_; + Monitorable* _tmp50_; + MonitorableUpdates* _tmp51_; + gint _tmp52_; #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp46_ = to_online; #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp46_ == NULL) { #line 2334 "MediaMonitor.c" - GeeArrayList* _tmp47_ = NULL; + GeeArrayList* _tmp47_; #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2371,15 +2371,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp53_ != NULL) { #line 2374 "MediaMonitor.c" - GeeMap* _tmp54_ = NULL; - gint _tmp55_ = 0; - gint _tmp56_ = 0; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - GeeMap* _tmp61_ = NULL; - TransactionController* _tmp62_ = NULL; + GeeMap* _tmp54_; + gint _tmp55_; + gint _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + GeeMap* _tmp61_; + TransactionController* _tmp62_; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp54_ = set_master_file; #line 334 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2428,15 +2428,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp63_ != NULL) { #line 2431 "MediaMonitor.c" - GeeMap* _tmp64_ = NULL; - gint _tmp65_ = 0; - gint _tmp66_ = 0; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - GeeMap* _tmp71_ = NULL; - TransactionController* _tmp72_ = NULL; + GeeMap* _tmp64_; + gint _tmp65_; + gint _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + GeeMap* _tmp71_; + TransactionController* _tmp72_; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp64_ = set_master_file_info; #line 340 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2488,7 +2488,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio _tmp73_ = TRUE; #line 2490 "MediaMonitor.c" } else { - GeeArrayList* _tmp75_ = NULL; + GeeArrayList* _tmp75_; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp75_ = to_online; #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2499,24 +2499,24 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio if (_tmp73_) { #line 2501 "MediaMonitor.c" gint _tmp76_ = 0; - GeeArrayList* _tmp77_ = NULL; + GeeArrayList* _tmp77_; gint _tmp81_ = 0; - GeeArrayList* _tmp82_ = NULL; - gchar* _tmp86_ = NULL; - gchar* _tmp87_ = NULL; - gchar* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; - GeeArrayList* _tmp90_ = NULL; - GeeArrayList* _tmp91_ = NULL; - TransactionController* _tmp92_ = NULL; + GeeArrayList* _tmp82_; + gchar* _tmp86_; + gchar* _tmp87_; + gchar* _tmp88_; + gchar* _tmp89_; + GeeArrayList* _tmp90_; + GeeArrayList* _tmp91_; + TransactionController* _tmp92_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp77_ = to_online; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp77_ != NULL) { #line 2517 "MediaMonitor.c" - GeeArrayList* _tmp78_ = NULL; - gint _tmp79_ = 0; - gint _tmp80_ = 0; + GeeArrayList* _tmp78_; + gint _tmp79_; + gint _tmp80_; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp78_ = to_online; #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2536,9 +2536,9 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp82_ != NULL) { #line 2539 "MediaMonitor.c" - GeeArrayList* _tmp83_ = NULL; - gint _tmp84_ = 0; - gint _tmp85_ = 0; + GeeArrayList* _tmp83_; + gint _tmp84_; + gint _tmp85_; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp83_ = to_offline; #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2622,23 +2622,23 @@ static gpointer _transaction_controller_ref0 (gpointer self) { static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { gboolean result = FALSE; - GCancellable* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GeeHashMap* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GCancellable* _tmp0_; + gboolean _tmp1_; + GeeHashMap* _tmp2_; + gint _tmp3_; + gint _tmp4_; GTimer* timer = NULL; - GTimer* _tmp5_ = NULL; + GTimer* _tmp5_; GeeArrayList* to_process = NULL; GeeArrayList* to_remove = NULL; gint op_count = 0; - GeeArrayList* _tmp29_ = NULL; - GeeArrayList* _tmp48_ = NULL; + GeeArrayList* _tmp29_; + GeeArrayList* _tmp47_; gdouble elapsed = 0.0; - GTimer* _tmp61_ = NULL; - gdouble _tmp62_ = 0.0; - gboolean _tmp63_ = FALSE; - gdouble _tmp64_ = 0.0; + GTimer* _tmp60_; + gdouble _tmp61_; + gboolean _tmp62_ = FALSE; + gdouble _tmp63_; GError * _inner_error_ = NULL; #line 356 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE); @@ -2679,12 +2679,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 2680 "MediaMonitor.c" { GeeIterator* _updates_it = NULL; - GeeHashMap* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeHashMap* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; + GeeIterator* _tmp11_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp6_ = self->priv->pending_updates; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2704,18 +2704,18 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { #line 2707 "MediaMonitor.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GeeIterator* _tmp12_; + gboolean _tmp13_; MonitorableUpdates* updates = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - MonitorableUpdates* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - MonitorableUpdates* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; - GeeArrayList* _tmp25_ = NULL; - GeeArrayList* _tmp27_ = NULL; - MonitorableUpdates* _tmp28_ = NULL; + GeeIterator* _tmp14_; + gpointer _tmp15_; + MonitorableUpdates* _tmp16_; + gboolean _tmp17_; + MonitorableUpdates* _tmp18_; + gboolean _tmp19_; + GeeArrayList* _tmp25_; + GeeArrayList* _tmp27_; + MonitorableUpdates* _tmp28_; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp12_ = _updates_it; #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2751,16 +2751,16 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp19_) { #line 2754 "MediaMonitor.c" - GeeArrayList* _tmp20_ = NULL; - GeeArrayList* _tmp22_ = NULL; - MonitorableUpdates* _tmp23_ = NULL; - Monitorable* _tmp24_ = NULL; + GeeArrayList* _tmp20_; + GeeArrayList* _tmp22_; + MonitorableUpdates* _tmp23_; + Monitorable* _tmp24_; #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp20_ = to_remove; #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp20_ == NULL) { #line 2763 "MediaMonitor.c" - GeeArrayList* _tmp21_ = NULL; + GeeArrayList* _tmp21_; #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2788,7 +2788,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp25_ == NULL) { #line 2791 "MediaMonitor.c" - GeeArrayList* _tmp26_ = NULL; + GeeArrayList* _tmp26_; #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL); #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2819,12 +2819,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { if (_tmp29_ != NULL) { #line 2821 "MediaMonitor.c" TransactionController* controller = NULL; - MediaSourceCollection* _tmp30_ = NULL; - MediaSourceCollection* _tmp31_ = NULL; - TransactionController* _tmp32_ = NULL; - TransactionController* _tmp33_ = NULL; - TransactionController* _tmp34_ = NULL; - TransactionController* _tmp35_ = NULL; + MediaSourceCollection* _tmp30_; + MediaSourceCollection* _tmp31_; + TransactionController* _tmp32_; + TransactionController* _tmp33_; + TransactionController* _tmp34_; + TransactionController* _tmp35_; #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp30_ = media_monitor_get_media_source_collection (self); #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2843,10 +2843,10 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { controller = _tmp35_; #line 2845 "MediaMonitor.c" { - TransactionController* _tmp36_ = NULL; - GeeArrayList* _tmp37_ = NULL; - TransactionController* _tmp38_ = NULL; - TransactionController* _tmp39_ = NULL; + TransactionController* _tmp36_; + GeeArrayList* _tmp37_; + TransactionController* _tmp38_; + TransactionController* _tmp39_; #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp36_ = controller; #line 393 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2860,7 +2860,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2863 "MediaMonitor.c" - goto __catch583_g_error; + goto __catch585_g_error; } #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp39_ = controller; @@ -2868,11 +2868,11 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { transaction_controller_commit (_tmp39_); #line 2870 "MediaMonitor.c" } - goto __finally583; - __catch583_g_error: + goto __finally585; + __catch585_g_error: { GError* err = NULL; - GError* _tmp40_ = NULL; + GError* _tmp40_; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" err = _inner_error_; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2882,43 +2882,40 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (_tmp40_->domain == DATABASE_ERROR) { #line 2885 "MediaMonitor.c" - GError* _tmp41_ = NULL; + GError* _tmp41_; #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _tmp41_ = err; #line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala" app_window_database_error ((GError*) _tmp41_); #line 2891 "MediaMonitor.c" } else { - const gchar* _tmp42_ = NULL; - GError* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; -#line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp42_ = _ ("Unable to process monitoring updates: %s"); + GError* _tmp42_; + const gchar* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp43_ = err; + _tmp42_ = err; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp44_ = _tmp43_->message; + _tmp43_ = _tmp42_->message; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp45_ = g_strdup_printf (_tmp42_, _tmp44_); + _tmp44_ = g_strdup_printf (_ ("Unable to process monitoring updates: %s"), _tmp43_); #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp46_ = _tmp45_; + _tmp45_ = _tmp44_; #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - app_window_panic (_tmp46_); + app_window_panic (_tmp45_); #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp46_); -#line 2912 "MediaMonitor.c" + _g_free0 (_tmp45_); +#line 2909 "MediaMonitor.c" } #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_error_free0 (err); -#line 2916 "MediaMonitor.c" +#line 2913 "MediaMonitor.c" } - __finally583: + __finally585: #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2921 "MediaMonitor.c" - gboolean _tmp47_ = FALSE; +#line 2918 "MediaMonitor.c" + gboolean _tmp46_ = FALSE; #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _transaction_controller_unref0 (controller); #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -2932,138 +2929,138 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_clear_error (&_inner_error_); #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - return _tmp47_; -#line 2937 "MediaMonitor.c" + return _tmp46_; +#line 2934 "MediaMonitor.c" } #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _transaction_controller_unref0 (controller); -#line 2941 "MediaMonitor.c" +#line 2938 "MediaMonitor.c" } #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp48_ = to_remove; + _tmp47_ = to_remove; #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp48_ != NULL) { -#line 2947 "MediaMonitor.c" + if (_tmp47_ != NULL) { +#line 2944 "MediaMonitor.c" { GeeArrayList* _monitorable_list = NULL; - GeeArrayList* _tmp49_ = NULL; - GeeArrayList* _tmp50_ = NULL; + GeeArrayList* _tmp48_; + GeeArrayList* _tmp49_; gint _monitorable_size = 0; - GeeArrayList* _tmp51_ = NULL; - gint _tmp52_ = 0; - gint _tmp53_ = 0; + GeeArrayList* _tmp50_; + gint _tmp51_; + gint _tmp52_; gint _monitorable_index = 0; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp49_ = to_remove; + _tmp48_ = to_remove; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp50_ = _g_object_ref0 (_tmp49_); + _tmp49_ = _g_object_ref0 (_tmp48_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_list = _tmp50_; + _monitorable_list = _tmp49_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp51_ = _monitorable_list; + _tmp50_ = _monitorable_list; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp52_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp51_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp53_ = _tmp52_; + _tmp52_ = _tmp51_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_size = _tmp53_; + _monitorable_size = _tmp52_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _monitorable_index = -1; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" while (TRUE) { -#line 2975 "MediaMonitor.c" - gint _tmp54_ = 0; - gint _tmp55_ = 0; - gint _tmp56_ = 0; +#line 2972 "MediaMonitor.c" + gint _tmp53_; + gint _tmp54_; + gint _tmp55_; Monitorable* monitorable = NULL; - GeeArrayList* _tmp57_ = NULL; - gint _tmp58_ = 0; - gpointer _tmp59_ = NULL; - Monitorable* _tmp60_ = NULL; + GeeArrayList* _tmp56_; + gint _tmp57_; + gpointer _tmp58_; + Monitorable* _tmp59_; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp54_ = _monitorable_index; + _tmp53_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _monitorable_index = _tmp54_ + 1; + _monitorable_index = _tmp53_ + 1; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp55_ = _monitorable_index; + _tmp54_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp56_ = _monitorable_size; + _tmp55_ = _monitorable_size; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (!(_tmp55_ < _tmp56_)) { + if (!(_tmp54_ < _tmp55_)) { #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" break; -#line 2996 "MediaMonitor.c" +#line 2993 "MediaMonitor.c" } #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp57_ = _monitorable_list; + _tmp56_ = _monitorable_list; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp58_ = _monitorable_index; + _tmp57_ = _monitorable_index; #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp59_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp58_); + _tmp58_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp57_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - monitorable = (Monitorable*) _tmp59_; + monitorable = (Monitorable*) _tmp58_; #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp60_ = monitorable; + _tmp59_ = monitorable; #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_remove_updates (self, _tmp60_); + media_monitor_remove_updates (self, _tmp59_); #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (monitorable); -#line 3012 "MediaMonitor.c" +#line 3009 "MediaMonitor.c" } #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala" _g_object_unref0 (_monitorable_list); -#line 3016 "MediaMonitor.c" +#line 3013 "MediaMonitor.c" } } #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp61_ = timer; + _tmp60_ = timer; #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp62_ = g_timer_elapsed (_tmp61_, NULL); + _tmp61_ = g_timer_elapsed (_tmp60_, NULL); #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - elapsed = _tmp62_; + elapsed = _tmp61_; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp64_ = elapsed; + _tmp63_ = elapsed; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp64_ > 0.01) { + if (_tmp63_ > 0.01) { #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp63_ = TRUE; -#line 3031 "MediaMonitor.c" + _tmp62_ = TRUE; +#line 3028 "MediaMonitor.c" } else { - gint _tmp65_ = 0; + gint _tmp64_; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp65_ = op_count; + _tmp64_ = op_count; #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp63_ = _tmp65_ > 0; -#line 3038 "MediaMonitor.c" + _tmp62_ = _tmp64_ > 0; +#line 3035 "MediaMonitor.c" } #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - if (_tmp63_) { -#line 3042 "MediaMonitor.c" - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - gdouble _tmp68_ = 0.0; - gint _tmp69_ = 0; - gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; + if (_tmp62_) { +#line 3039 "MediaMonitor.c" + gchar* _tmp65_; + gchar* _tmp66_; + gdouble _tmp67_; + gint _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp66_ = media_monitor_to_string (self); + _tmp65_ = media_monitor_to_string (self); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp67_ = _tmp66_; + _tmp66_ = _tmp65_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp68_ = elapsed; + _tmp67_ = elapsed; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp69_ = op_count; + _tmp68_ = op_count; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp70_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp67_, _tmp68_, _tmp69_); + _tmp69_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp66_, _tmp67_, _tmp68_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp71_ = _tmp70_; + _tmp70_ = _tmp69_; #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - media_monitor_mdbg (_tmp71_); + media_monitor_mdbg (_tmp70_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp71_); + _g_free0 (_tmp70_); #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _g_free0 (_tmp67_); -#line 3067 "MediaMonitor.c" + _g_free0 (_tmp66_); +#line 3064 "MediaMonitor.c" } #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala" result = TRUE; @@ -3075,7 +3072,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) { _g_timer_destroy0 (timer); #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala" return result; -#line 3079 "MediaMonitor.c" +#line 3076 "MediaMonitor.c" } @@ -3085,51 +3082,51 @@ static void media_monitor_class_init (MediaMonitorClass * klass) { #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" g_type_class_add_private (klass, sizeof (MediaMonitorPrivate)); #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) media_monitor_real_get_media_source_collection; + ((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*) (MediaMonitor *)) media_monitor_real_get_media_source_collection; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->close = (void (*)(MediaMonitor*)) media_monitor_real_close; + ((MediaMonitorClass *) klass)->close = (void (*) (MediaMonitor *)) media_monitor_real_close; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->to_string = (gchar* (*)(MediaMonitor*)) media_monitor_real_to_string; + ((MediaMonitorClass *) klass)->to_string = (gchar* (*) (MediaMonitor *)) media_monitor_real_to_string; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) media_monitor_real_create_updates; + ((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*) (MediaMonitor *, Monitorable*)) media_monitor_real_create_updates; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*)(MediaMonitor*, DataSource*)) media_monitor_real_on_media_source_destroyed; + ((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*) (MediaMonitor *, DataSource*)) media_monitor_real_on_media_source_destroyed; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_discovery_started = (void (*)(MediaMonitor*)) media_monitor_real_notify_discovery_started; + ((MediaMonitorClass *) klass)->notify_discovery_started = (void (*) (MediaMonitor *)) media_monitor_real_notify_discovery_started; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) media_monitor_real_notify_file_discovered; + ((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*) (MediaMonitor *, GFile*, GFileInfo*, Monitorable* *)) media_monitor_real_notify_file_discovered; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) media_monitor_real_candidates_for_unknown_file; + ((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*) (MediaMonitor *, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) media_monitor_real_candidates_for_unknown_file; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*)(MediaMonitor*, Monitorable*, int*)) media_monitor_real_get_auxilliary_backing_files; + ((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*) (MediaMonitor *, Monitorable*, int*)) media_monitor_real_get_auxilliary_backing_files; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->update_backing_file_info = (void (*)(MediaMonitor*, Monitorable*, GFile*, GFileInfo*)) media_monitor_real_update_backing_file_info; + ((MediaMonitorClass *) klass)->update_backing_file_info = (void (*) (MediaMonitor *, Monitorable*, GFile*, GFileInfo*)) media_monitor_real_update_backing_file_info; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*)(MediaMonitor*)) media_monitor_real_notify_discovery_completing; + ((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*) (MediaMonitor *)) media_monitor_real_notify_discovery_completing; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_is_file_represented; + ((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_is_file_represented; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) media_monitor_real_notify_file_created; + ((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) media_monitor_real_notify_file_created; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) media_monitor_real_notify_file_moved; + ((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*) (MediaMonitor *, GFile*, GFile*, GFileInfo*)) media_monitor_real_notify_file_moved; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_altered; + ((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_notify_file_altered; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_attributes_altered; + ((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_notify_file_attributes_altered; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) media_monitor_real_notify_file_alteration_completed; + ((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) media_monitor_real_notify_file_alteration_completed; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_deleted; + ((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*) (MediaMonitor *, GFile*)) media_monitor_real_notify_file_deleted; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - ((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates; + ((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" G_OBJECT_CLASS (klass)->finalize = media_monitor_finalize; -#line 3128 "MediaMonitor.c" +#line 3125 "MediaMonitor.c" } static void media_monitor_instance_init (MediaMonitor * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv = MEDIA_MONITOR_GET_PRIVATE (self); #line 114 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -3138,16 +3135,16 @@ static void media_monitor_instance_init (MediaMonitor * self) { self->priv->pending_updates = _tmp0_; #line 116 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self->priv->pending_updates_timer_id = (guint) 0; -#line 3142 "MediaMonitor.c" +#line 3139 "MediaMonitor.c" } -static void media_monitor_finalize (GObject* obj) { +static void media_monitor_finalize (GObject * obj) { MediaMonitor * self; - MediaSourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; - MediaSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; + MediaSourceCollection* _tmp0_; + guint _tmp1_; + MediaSourceCollection* _tmp2_; + guint _tmp3_; #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_MONITOR, MediaMonitor); #line 130 "/home/jens/Source/shotwell/src/MediaMonitor.vala" @@ -3170,7 +3167,7 @@ static void media_monitor_finalize (GObject* obj) { _g_object_unref0 (self->priv->pending_updates); #line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala" G_OBJECT_CLASS (media_monitor_parent_class)->finalize (obj); -#line 3174 "MediaMonitor.c" +#line 3171 "MediaMonitor.c" } -- cgit v1.2.3