From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/Event.c | 64 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src/Event.c') diff --git a/src/Event.c b/src/Event.c index c427644..984004e 100644 --- a/src/Event.c +++ b/src/Event.c @@ -3757,7 +3757,7 @@ Event* event_create_empty_event (MediaSource* source) { #line 476 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 3760 "Event.c" - goto __catch436_database_error; + goto __catch444_database_error; } #line 476 "/home/jens/Source/shotwell/src/Event.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3795,8 +3795,8 @@ Event* event_create_empty_event (MediaSource* source) { return result; #line 3797 "Event.c" } - goto __finally436; - __catch436_database_error: + goto __finally444; + __catch444_database_error: { GError* err = NULL; GError* _tmp14_; @@ -3816,7 +3816,7 @@ Event* event_create_empty_event (MediaSource* source) { return result; #line 3818 "Event.c" } - __finally436: + __finally444: #line 475 "/home/jens/Source/shotwell/src/Event.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 475 "/home/jens/Source/shotwell/src/Event.vala" @@ -4025,11 +4025,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so #line 526 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4028 "Event.c" - goto __catch437_g_error; + goto __catch445_g_error; } } - goto __finally437; - __catch437_g_error: + goto __finally445; + __catch445_g_error: { GError* err = NULL; GError* _tmp6_; @@ -4056,7 +4056,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so _g_error_free0 (err); #line 4058 "Event.c" } - __finally437: + __finally445: #line 525 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 525 "/home/jens/Source/shotwell/src/Event.vala" @@ -4086,11 +4086,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so #line 532 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4089 "Event.c" - goto __catch438_g_error; + goto __catch446_g_error; } } - goto __finally438; - __catch438_g_error: + goto __finally446; + __catch446_g_error: { GError* err = NULL; GError* _tmp13_; @@ -4117,7 +4117,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so _g_error_free0 (err); #line 4119 "Event.c" } - __finally438: + __finally446: #line 531 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 531 "/home/jens/Source/shotwell/src/Event.vala" @@ -4203,11 +4203,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection #line 556 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4206 "Event.c" - goto __catch439_g_error; + goto __catch447_g_error; } } - goto __finally439; - __catch439_g_error: + goto __finally447; + __catch447_g_error: { GError* err = NULL; GError* _tmp6_; @@ -4234,7 +4234,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection _g_error_free0 (err); #line 4236 "Event.c" } - __finally439: + __finally447: #line 555 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 555 "/home/jens/Source/shotwell/src/Event.vala" @@ -4264,11 +4264,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection #line 562 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4267 "Event.c" - goto __catch440_g_error; + goto __catch448_g_error; } } - goto __finally440; - __catch440_g_error: + goto __finally448; + __catch448_g_error: { GError* err = NULL; GError* _tmp13_; @@ -4295,7 +4295,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection _g_error_free0 (err); #line 4297 "Event.c" } - __finally440: + __finally448: #line 561 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 561 "/home/jens/Source/shotwell/src/Event.vala" @@ -5329,7 +5329,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s #line 658 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 5331 "Event.c" - goto __catch441_database_error; + goto __catch449_database_error; } #line 658 "/home/jens/Source/shotwell/src/Event.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5386,8 +5386,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s return result; #line 5387 "Event.c" } - goto __finally441; - __catch441_database_error: + goto __finally449; + __catch449_database_error: { GError* err = NULL; GError* _tmp49_; @@ -5403,7 +5403,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s _g_error_free0 (err); #line 5404 "Event.c" } - __finally441: + __finally449: #line 657 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 657 "/home/jens/Source/shotwell/src/Event.vala" @@ -6906,7 +6906,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { #line 903 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 6908 "Event.c" - goto __catch442_g_error; + goto __catch450_g_error; } #line 903 "/home/jens/Source/shotwell/src/Event.vala" _tmp6_ = _tmp0_; @@ -6920,8 +6920,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { return result; #line 6921 "Event.c" } - goto __finally442; - __catch442_g_error: + goto __finally450; + __catch450_g_error: { GError* err = NULL; #line 902 "/home/jens/Source/shotwell/src/Event.vala" @@ -6936,7 +6936,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { return result; #line 6937 "Event.c" } - __finally442: + __finally450: #line 902 "/home/jens/Source/shotwell/src/Event.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 902 "/home/jens/Source/shotwell/src/Event.vala" @@ -6978,7 +6978,7 @@ static void event_real_destroy (DataSource* base) { #line 915 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { #line 6980 "Event.c" - goto __catch443_database_error; + goto __catch451_database_error; } #line 915 "/home/jens/Source/shotwell/src/Event.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -6989,8 +6989,8 @@ static void event_real_destroy (DataSource* base) { #line 6989 "Event.c" } } - goto __finally443; - __catch443_database_error: + goto __finally451; + __catch451_database_error: { GError* err = NULL; GError* _tmp3_; @@ -7006,7 +7006,7 @@ static void event_real_destroy (DataSource* base) { _g_error_free0 (err); #line 7007 "Event.c" } - __finally443: + __finally451: #line 914 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 914 "/home/jens/Source/shotwell/src/Event.vala" -- cgit v1.2.3 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/Event.c | 5598 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 2834 insertions(+), 2764 deletions(-) (limited to 'src/Event.c') diff --git a/src/Event.c b/src/Event.c index 984004e..7ebadad 100644 --- a/src/Event.c +++ b/src/Event.c @@ -1,4 +1,4 @@ -/* Event.c generated by valac 0.36.6, the Vala compiler +/* Event.c generated by valac 0.40.4, the Vala compiler * generated from Event.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -270,9 +271,9 @@ typedef struct _ThumbnailView ThumbnailView; typedef struct _ThumbnailViewClass ThumbnailViewClass; enum { EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL, - EVENT_SOURCE_COLLECTION_LAST_SIGNAL + EVENT_SOURCE_COLLECTION_NUM_SIGNALS }; -static guint event_source_collection_signals[EVENT_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; +static guint event_source_collection_signals[EVENT_SOURCE_COLLECTION_NUM_SIGNALS] = {0}; typedef struct _DataObjectPrivate DataObjectPrivate; typedef struct _DataSourcePrivate DataSourcePrivate; @@ -326,6 +327,11 @@ typedef struct _SourceProxyClass SourceProxyClass; typedef struct _Indexable Indexable; typedef struct _IndexableIface IndexableIface; typedef struct _EventPrivate EventPrivate; +enum { + EVENT_0_PROPERTY, + EVENT_NUM_PROPERTIES +}; +static GParamSpec* event_properties[EVENT_NUM_PROPERTIES]; #define TYPE_DATABASE_TABLE (database_table_get_type ()) #define DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_TABLE, DatabaseTable)) @@ -915,17 +921,29 @@ static IndexableIface * event_indexable_parent_iface = NULL; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; GType marker_get_type (void) G_GNUC_CONST; @@ -933,9 +951,15 @@ GType source_collection_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; @@ -944,120 +968,193 @@ GType container_source_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; #define EVENT_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollectionPrivate)) -enum { - EVENT_SOURCE_COLLECTION_DUMMY_PROPERTY -}; EventSourceCollection* event_source_collection_new (void); EventSourceCollection* event_source_collection_construct (GType object_type); #define EVENT_TYPENAME "event" static gint64 event_source_collection_get_event_key (DataSource* source); -static gint64 _event_source_collection_get_event_key_get_source_database_key (DataSource* source, gpointer self); -ContainerSourceCollection* container_source_collection_construct (GType object_type, const gchar* backlink_name, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -void container_source_collection_attach_collection (ContainerSourceCollection* self, SourceCollection* collection); +static gint64 _event_source_collection_get_event_key_get_source_database_key (DataSource* source, + gpointer self); +ContainerSourceCollection* container_source_collection_construct (GType object_type, + const gchar* backlink_name, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +void container_source_collection_attach_collection (ContainerSourceCollection* self, + SourceCollection* collection); GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; void event_source_collection_init (EventSourceCollection* self); ViewCollection* view_collection_new (const gchar* name); -ViewCollection* view_collection_construct (GType object_type, const gchar* name); +ViewCollection* view_collection_construct (GType object_type, + const gchar* name); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static GType event_source_collection_no_event_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_new (void); static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_construct (GType object_type); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -static void event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, GeeIterable* added, GeeIterable* removed); -static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); -static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +static void event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, + GeeIterable* added, + GeeIterable* removed); +static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); +static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); -void event_get_event_id (Event* self, EventID* result); -Event* event_source_collection_fetch (EventSourceCollection* self, EventID* event_id); -DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, gint64 key); -static GeeCollection* event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source); +void event_get_event_id (Event* self, + EventID* result); +Event* event_source_collection_fetch (EventSourceCollection* self, + EventID* event_id); +DataSource* database_source_collection_fetch_by_key (DatabaseSourceCollection* self, + gint64 key); +static GeeCollection* event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, + DataSource* source); GType media_source_get_type (void) G_GNUC_CONST; Event* media_source_get_event (MediaSource* self); -static ContainerSource* event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, SourceBacklink* backlink); +static ContainerSource* event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, + SourceBacklink* backlink); gint64 source_backlink_get_instance_id (SourceBacklink* self); -void event_id_init (EventID *self, gint64 id); +void event_id_init (EventID *self, + gint64 id); GeeCollection* container_source_collection_get_holding_tank (ContainerSourceCollection* self); GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self); GeeCollection* view_collection_get_sources (ViewCollection* self); GType data_view_get_type (void) G_GNUC_CONST; -enum { - EVENT_SOURCE_COLLECTION_NO_EVENT_VIEW_MANAGER_DUMMY_PROPERTY -}; -static gboolean event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source); -void media_source_get_event_id (MediaSource* self, EventID* result); +static gboolean event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); +void media_source_get_event_id (MediaSource* self, + EventID* result); #define EVENT_ID_INVALID ((gint64) -1) -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); -static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, DataSource* source); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); +static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, + DataSource* source); ThumbnailView* thumbnail_view_new (ThumbnailSource* source); -ThumbnailView* thumbnail_view_construct (GType object_type, ThumbnailSource* source); +ThumbnailView* thumbnail_view_construct (GType object_type, + ThumbnailSource* source); GType thumbnail_view_get_type (void) G_GNUC_CONST; ViewManager* view_manager_construct (GType object_type); static void event_source_collection_finalize (DataCollection * obj); gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; gpointer source_proxy_ref (gpointer instance); void source_proxy_unref (gpointer instance); -GParamSpec* param_spec_source_proxy (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_proxy (GValue* value, gpointer v_object); -void value_take_source_proxy (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_proxy (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_proxy (GValue* value, + gpointer v_object); +void value_take_source_proxy (GValue* value, + gpointer v_object); gpointer value_get_source_proxy (const GValue* value); GType source_proxy_get_type (void) G_GNUC_CONST; GType proxyable_get_type (void) G_GNUC_CONST; GType indexable_get_type (void) G_GNUC_CONST; #define EVENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT, EventPrivate)) -enum { - EVENT_DUMMY_PROPERTY -}; static void event_on_primary_thumbnail_altered (Event* self); -static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, gpointer self); -static void event_on_media_altered (Event* self, GeeMap* items); -static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); -static void event_on_media_removed (Event* self, GeeIterable* removed); -static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self); -static void event_on_media_added (Event* self, GeeIterable* added); -static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self); -static void event_on_media_destroyed (Event* self, DataSource* source); -static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, + gpointer self); +static void event_on_media_altered (Event* self, + GeeMap* items); +static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); +static void event_on_media_removed (Event* self, + GeeIterable* removed); +static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self); +static void event_on_media_added (Event* self, + GeeIterable* added); +static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self); +static void event_on_media_destroyed (Event* self, + DataSource* source); +static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType event_table_get_type (void) G_GNUC_CONST; @@ -1066,37 +1163,78 @@ GType event_table_get_type (void) G_GNUC_CONST; #define EVENT_TIME_T_DAY ((time_t) ((24 * 60) * 60)) gpointer event_row_ref (gpointer instance); void event_row_unref (gpointer instance); -GParamSpec* param_spec_event_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_event_row (GValue* value, gpointer v_object); -void value_take_event_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_event_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_event_row (GValue* value, + gpointer v_object); +void value_take_event_row (GValue* value, + gpointer v_object); gpointer value_get_event_row (const GValue* value); GType event_row_get_type (void) G_GNUC_CONST; -static Event* event_new (EventRow* event_row, gint64 object_id); -static Event* event_construct (GType object_type, EventRow* event_row, gint64 object_id); -EventSource* event_source_construct (GType object_type, gint64 object_id); +static Event* event_new (EventRow* event_row, + gint64 object_id); +static Event* event_construct (GType object_type, + EventRow* event_row, + gint64 object_id); +EventSource* event_source_construct (GType object_type, + gint64 object_id); gchar* event_prep_event_name (const gchar* name); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, EventID* event_id); -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id); -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static gint64 event_view_comparator (void* a, void* b); -static gint64 _event_view_comparator_comparator (void* a, void* b, gpointer self); -static gboolean event_view_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _event_view_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked); -void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked); +GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, + EventID* event_id); +MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static gint64 event_view_comparator (void* a, + void* b); +static gint64 _event_view_comparator_comparator (void* a, + void* b, + gpointer self); +static gboolean event_view_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _event_view_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked); +void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* added, + gboolean relinked, + GeeCollection* removed, + gboolean unlinked); gint data_collection_get_count (DataCollection* self); DataView* view_collection_get_first_unrejected (ViewCollection* self); DataSource* data_view_get_source (DataView* self); -gboolean event_table_set_primary_source_id (EventTable* self, EventID* event_id, const gchar* primary_source_id); +gboolean event_table_set_primary_source_id (EventTable* self, + EventID* event_id, + const gchar* primary_source_id); gchar* data_source_get_source_id (DataSource* self); static void event_update_indexable_keywords (Event* self); static gchar* event_real_get_typename (DataSource* base); @@ -1105,106 +1243,178 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base); static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSource* base); PhotoFileFormat thumbnail_source_get_preferred_thumbnail_format (ThumbnailSource* self); PhotoFileFormat photo_file_format_get_system_default_format (void); -static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error); -void event_init (ProgressMonitor monitor, void* monitor_target); +static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +void event_init (ProgressMonitor monitor, + void* monitor_target); EventTable* event_table_get_instance (void); GeeArrayList* event_table_get_events (EventTable* self); #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1) gint event_source_get_media_count (EventSource* self); -void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlinked_from, const gchar* dehydrated); -void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked); +void data_source_rehydrate_backlinks (DataSource* self, + SourceCollection* unlinked_from, + const gchar* dehydrated); +void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, + GeeCollection* unlinked); void event_terminate (void); time_t media_source_get_exposure_time (MediaSource* self); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 -void event_attach (Event* self, MediaSource* source); -gboolean data_collection_add (DataCollection* self, DataObject* object); -void event_attach_many (Event* self, GeeCollection* media); -void event_detach (Event* self, MediaSource* source); -void data_collection_remove_marked (DataCollection* self, Marker* m); -Marker* data_collection_mark (DataCollection* self, DataObject* object); -DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source); -void event_detach_many (Event* self, GeeCollection* media); -Marker* data_collection_mark_many (DataCollection* self, GeeCollection* objects); -gboolean event_contains_media_type (Event* self, const gchar* media_type); +void event_attach (Event* self, + MediaSource* source); +gboolean data_collection_add (DataCollection* self, + DataObject* object); +void event_attach_many (Event* self, + GeeCollection* media); +void event_detach (Event* self, + MediaSource* source); +void data_collection_remove_marked (DataCollection* self, + Marker* m); +Marker* data_collection_mark (DataCollection* self, + DataObject* object); +DataView* view_collection_get_view_for_source (ViewCollection* self, + DataSource* source); +void event_detach_many (Event* self, + GeeCollection* media); +Marker* data_collection_mark_many (DataCollection* self, + GeeCollection* objects); +gboolean event_contains_media_type (Event* self, + const gchar* media_type); GeeCollection* event_source_get_media (EventSource* self); gchar* data_source_get_typename (DataSource* self); -static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +static GeeArrayList* event_views_to_media (Event* self, + GeeIterable* views); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); Alteration* alteration_new_from_list (const gchar* list); -Alteration* alteration_construct_from_list (GType object_type, const gchar* list); -void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked); -gboolean event_set_primary_source (Event* self, MediaSource* source); +Alteration* alteration_construct_from_list (GType object_type, + const gchar* list); +void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, + ContainerSource* container, + GeeCollection* removed, + gboolean unlinked); +gboolean event_set_primary_source (Event* self, + MediaSource* source); static void event_release_primary_source (Event* self); -void container_source_collection_evaporate (ContainerSourceCollection* self, ContainerSource* container); -static void event_real_notify_relinking (DataSource* base, SourceCollection* sources); -void data_source_notify_relinking (DataSource* self, SourceCollection* collection); +void container_source_collection_evaporate (ContainerSourceCollection* self, + ContainerSource* container); +static void event_real_notify_relinking (DataSource* base, + SourceCollection* sources); +void data_source_notify_relinking (DataSource* self, + SourceCollection* collection); gboolean event_has_name (Event* self); MediaSource* event_get_primary_source (Event* self); GType rating_get_type (void) G_GNUC_CONST; Rating media_source_get_rating (MediaSource* self); Event* event_create_empty_event (MediaSource* source); GQuark database_error_quark (void); -EventRow* event_table_create (EventTable* self, const gchar* primary_source_id, const gchar* comment, GError** error); +EventRow* event_table_create (EventTable* self, + const gchar* primary_source_id, + const gchar* comment, + GError** error); gchar* data_object_to_string (DataObject* self); void app_window_database_error (GError* err); -static Event* event_reconstitute (gint64 object_id, EventRow* row); -void event_table_create_from_row (EventTable* self, EventRow* row, EventID* result); -gboolean data_collection_contains (DataCollection* self, DataObject* object); +static Event* event_reconstitute (gint64 object_id, + EventRow* row); +void event_table_create_from_row (EventTable* self, + EventRow* row, + EventID* result); +gboolean data_collection_contains (DataCollection* self, + DataObject* object); static gboolean event_real_has_links (ContainerSource* base); -gboolean source_collection_has_backlink (SourceCollection* self, SourceBacklink* backlink); +gboolean source_collection_has_backlink (SourceCollection* self, + SourceBacklink* backlink); SourceBacklink* container_source_get_backlink (ContainerSource* self); static SourceBacklink* event_real_get_backlink (ContainerSource* base); SourceBacklink* source_backlink_new_from_source (DataSource* source); -SourceBacklink* source_backlink_construct_from_source (GType object_type, DataSource* source); -static void event_real_break_link (ContainerSource* base, DataSource* source); -gboolean media_source_set_event (MediaSource* self, Event* new_event); -static void event_real_break_link_many (ContainerSource* base, GeeCollection* sources); +SourceBacklink* source_backlink_construct_from_source (GType object_type, + DataSource* source); +static void event_real_break_link (ContainerSource* base, + DataSource* source); +gboolean media_source_set_event (MediaSource* self, + Event* new_event); +static void event_real_break_link_many (ContainerSource* base, + GeeCollection* sources); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; -void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos); +void media_source_collection_filter_media (GeeCollection* media, + GeeCollection* photos, + GeeCollection* videos); gpointer transaction_controller_ref (gpointer instance); void transaction_controller_unref (gpointer instance); -GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_transaction_controller (GValue* value, gpointer v_object); -void value_take_transaction_controller (GValue* value, gpointer v_object); +GParamSpec* param_spec_transaction_controller (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_transaction_controller (GValue* value, + gpointer v_object); +void value_take_transaction_controller (GValue* value, + gpointer v_object); gpointer value_get_transaction_controller (const GValue* value); GType transaction_controller_get_type (void) G_GNUC_CONST; -void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, TransactionController* controller, GError** error); +void media_source_set_many_to_event (GeeCollection* media_sources, + Event* event, + TransactionController* controller, + GError** error); TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); -static void event_real_establish_link (ContainerSource* base, DataSource* source); -static void event_real_establish_link_many (ContainerSource* base, GeeCollection* sources); +void app_window_error_message (const gchar* message, + GtkWindow* parent); +static void event_real_establish_link (ContainerSource* base, + DataSource* source); +static void event_real_establish_link_many (ContainerSource* base, + GeeCollection* sources); gchar* event_get_raw_name (Event* self); gchar* event_source_get_comment (EventSource* self); gchar* indexable_prepare_indexable_string (const gchar* str); static const gchar* event_real_get_indexable_keywords (Indexable* base); -gboolean event_is_in_starting_day (Event* self, time_t time); -DataObject* data_collection_get_at (DataCollection* self, gint index); -static Event* event_generate_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name, gboolean* new_event); +gboolean event_is_in_starting_day (Event* self, + time_t time); +DataObject* data_collection_get_at (DataCollection* self, + gint index); +static Event* event_generate_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name, + gboolean* new_event); GType event_view_get_type (void) G_GNUC_CONST; gchar* data_object_get_name (DataObject* self); -gboolean event_rename (Event* self, const gchar* name); +gboolean event_rename (Event* self, + const gchar* name); EventView* event_view_new (EventSource* source); -EventView* event_view_construct (GType object_type, EventSource* source); -void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name); -void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far); +EventView* event_view_construct (GType object_type, + EventSource* source); +void event_generate_single_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name); +void event_generate_many_events (GeeCollection* sources, + ViewCollection* events_so_far); static SourceSnapshot* event_real_save_snapshot (DataSource* base); static EventEventSnapshot* event_event_snapshot_new (Event* event); -static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Event* event); +static EventEventSnapshot* event_event_snapshot_construct (GType object_type, + Event* event); static GType event_event_snapshot_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static SourceProxy* event_real_get_proxy (Proxyable* base); static EventEventProxy* event_event_proxy_new (Event* event); -static EventEventProxy* event_event_proxy_construct (GType object_type, Event* event); +static EventEventProxy* event_event_proxy_construct (GType object_type, + Event* event); static GType event_event_proxy_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static gboolean event_real_equals (DataSource* base, DataSource* source); -gboolean data_source_equals (DataSource* self, DataSource* source); +static gboolean event_real_equals (DataSource* base, + DataSource* source); +gboolean data_source_equals (DataSource* self, + DataSource* source); static gchar* event_real_to_string (DataObject* base); gint64 data_object_get_object_id (DataObject* self); static gchar* event_real_get_name (DataObject* base); @@ -1213,26 +1423,46 @@ gboolean is_string_empty (const gchar* s); time_t event_source_get_start_time (EventSource* self); time_t event_source_get_end_time (EventSource* self); gchar* format_local_date (struct tm* date); -gchar* format_local_datespan (struct tm* from_date, struct tm* to_date); +gchar* format_local_datespan (struct tm* from_date, + struct tm* to_date); static gchar* event_real_get_comment (EventSource* base); -gboolean event_table_rename (EventTable* self, EventID* event_id, const gchar* name); -static gboolean event_real_set_comment (EventSource* base, const gchar* comment); +gboolean event_table_rename (EventTable* self, + EventID* event_id, + const gchar* name); +static gboolean event_real_set_comment (EventSource* base, + const gchar* comment); gchar* media_source_prep_comment (const gchar* comment); -gboolean event_table_set_comment (EventTable* self, EventID* event_id, const gchar* new_comment); +gboolean event_table_set_comment (EventTable* self, + EventID* event_id, + const gchar* new_comment); time_t event_get_creation_time (Event* self); -time_t event_table_get_time_created (EventTable* self, EventID* event_id); +time_t event_table_get_time_created (EventTable* self, + EventID* event_id); static time_t event_real_get_start_time (EventSource* base); static time_t event_real_get_end_time (EventSource* base); static guint64 event_real_get_total_filesize (EventSource* base); guint64 media_source_get_filesize (MediaSource* self); static gint event_real_get_media_count (EventSource* base); static GeeCollection* event_real_get_media (EventSource* base); -void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target); +void event_mirror_photos (Event* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +void view_collection_mirror (ViewCollection* self, + ViewCollection* to_mirror, + CreateView mirroring_ctor, + void* mirroring_ctor_target, + CreateViewPredicate should_mirror, + void* should_mirror_target); void thumbnail_source_notify_thumbnail_altered (ThumbnailSource* self); -gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource* source); -static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); +gboolean view_collection_has_view_for_source (ViewCollection* self, + DataSource* source); +static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; @@ -1240,52 +1470,69 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling); -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); +GdkPixbuf* event_get_preview_pixbuf (Event* self, + Scaling* scaling); +GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); static void event_real_destroy (DataSource* base); void view_collection_halt_all_monitoring (ViewCollection* self); -void event_table_remove (EventTable* self, EventID* event_id, GError** error); +void event_table_remove (EventTable* self, + EventID* event_id, + GError** error); GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); -gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id); +gboolean photo_table_drop_event (PhotoTable* self, + EventID* event_id); GType video_table_get_type (void) G_GNUC_CONST; VideoTable* video_table_get_instance (void); -gboolean video_table_drop_event (VideoTable* self, EventID* event_id); +gboolean video_table_drop_event (VideoTable* self, + EventID* event_id); void data_source_destroy (DataSource* self); #define EVENT_EVENT_SNAPSHOT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENT_TYPE_EVENT_SNAPSHOT, EventEventSnapshotPrivate)) -enum { - EVENT_EVENT_SNAPSHOT_DUMMY_PROPERTY -}; -static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, DataSource* source); -static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self); +static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, + DataSource* source); +static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self); SourceSnapshot* source_snapshot_construct (GType object_type); -EventRow* event_table_get_row (EventTable* self, EventID* event_id); +EventRow* event_table_get_row (EventTable* self, + EventID* event_id); static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self); static void event_event_snapshot_real_notify_broken (SourceSnapshot* base); EventRow* event_row_new (void); EventRow* event_row_construct (GType object_type); void source_snapshot_notify_broken (SourceSnapshot* self); static void event_event_snapshot_finalize (SourceSnapshot * obj); -enum { - EVENT_EVENT_PROXY_DUMMY_PROPERTY -}; -SourceProxy* source_proxy_construct (GType object_type, DataSource* source); -static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot); +SourceProxy* source_proxy_construct (GType object_type, + DataSource* source); +static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, + gint64 object_id, + SourceSnapshot* snapshot); static void event_finalize (GObject * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - - -static gint64 _event_source_collection_get_event_key_get_source_database_key (DataSource* source, gpointer self) { +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); + + +static gint64 +_event_source_collection_get_event_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = event_source_collection_get_event_key (source); #line 25 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1285 "Event.c" +#line 1530 "Event.c" } -EventSourceCollection* event_source_collection_construct (GType object_type) { +EventSourceCollection* +event_source_collection_construct (GType object_type) +{ EventSourceCollection* self = NULL; LibraryPhotoSourceCollection* _tmp0_; VideoSourceCollection* _tmp1_; @@ -1301,25 +1548,34 @@ EventSourceCollection* event_source_collection_construct (GType object_type) { container_source_collection_attach_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection)); #line 24 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 1305 "Event.c" +#line 1552 "Event.c" } -EventSourceCollection* event_source_collection_new (void) { +EventSourceCollection* +event_source_collection_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/Event.vala" return event_source_collection_construct (TYPE_EVENT_SOURCE_COLLECTION); -#line 1312 "Event.c" +#line 1561 "Event.c" } -static void _event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_event_source_collection_on_no_event_collection_altered_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_on_no_event_collection_altered ((EventSourceCollection*) self, added, removed); -#line 1319 "Event.c" +#line 1573 "Event.c" } -void event_source_collection_init (EventSourceCollection* self) { +void +event_source_collection_init (EventSourceCollection* self) +{ ViewCollection* _tmp0_; EventSourceCollectionNoEventViewManager* view_manager = NULL; EventSourceCollectionNoEventViewManager* _tmp1_; @@ -1378,71 +1634,75 @@ void event_source_collection_init (EventSourceCollection* self) { _alteration_unref0 (filter_alteration); #line 31 "/home/jens/Source/shotwell/src/Event.vala" _view_manager_unref0 (view_manager); -#line 1382 "Event.c" +#line 1638 "Event.c" } -static gboolean event_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +event_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ EventSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 43 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); #line 43 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 44 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 44 "/home/jens/Source/shotwell/src/Event.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_EVENT); #line 44 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1400 "Event.c" +#line 1656 "Event.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/Event.vala" return self ? g_object_ref (self) : NULL; -#line 1407 "Event.c" +#line 1665 "Event.c" } -static gint64 event_source_collection_get_event_key (DataSource* source) { +static gint64 +event_source_collection_get_event_key (DataSource* source) +{ gint64 result = 0LL; Event* event = NULL; - DataSource* _tmp0_; - Event* _tmp1_; + Event* _tmp0_; EventID event_id = {0}; - EventID _tmp2_ = {0}; - EventID _tmp3_; - gint64 _tmp4_; + EventID _tmp1_ = {0}; + EventID _tmp2_; + gint64 _tmp3_; #line 47 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 48 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 48 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event)); #line 48 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp1_; + event = _tmp0_; #line 49 "/home/jens/Source/shotwell/src/Event.vala" - event_get_event_id (event, &_tmp2_); + event_get_event_id (event, &_tmp1_); #line 49 "/home/jens/Source/shotwell/src/Event.vala" - event_id = _tmp2_; + event_id = _tmp1_; #line 51 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_id; + _tmp2_ = event_id; #line 51 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 51 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp4_; + result = _tmp3_; #line 51 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 51 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1442 "Event.c" +#line 1699 "Event.c" } -Event* event_source_collection_fetch (EventSourceCollection* self, EventID* event_id) { +Event* +event_source_collection_fetch (EventSourceCollection* self, + EventID* event_id) +{ Event* result = NULL; EventID _tmp0_; gint64 _tmp1_; @@ -1461,161 +1721,158 @@ Event* event_source_collection_fetch (EventSourceCollection* self, EventID* even result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT, Event); #line 55 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1465 "Event.c" +#line 1725 "Event.c" } -static GeeCollection* event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, DataSource* source) { +static GeeCollection* +event_source_collection_real_get_containers_holding_source (ContainerSourceCollection* base, + DataSource* source) +{ EventSourceCollection * self; GeeCollection* result = NULL; Event* event = NULL; - DataSource* _tmp0_; + Event* _tmp0_; Event* _tmp1_; - Event* _tmp2_; GeeArrayList* list = NULL; + GeeArrayList* _tmp2_; GeeArrayList* _tmp3_; - GeeArrayList* _tmp4_; - Event* _tmp5_; + Event* _tmp4_; #line 58 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); #line 58 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 59 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 59 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp0_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 59 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp1_; + event = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event; + _tmp1_ = event; #line 60 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 61 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; #line 61 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 61 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1500 "Event.c" +#line 1760 "Event.c" } #line 63 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 63 "/home/jens/Source/shotwell/src/Event.vala" - list = _tmp3_; + list = _tmp2_; #line 64 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = list; + _tmp3_ = list; #line 64 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event; + _tmp4_ = event; #line 64 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONTAINER_SOURCE, ContainerSource)); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 66 "/home/jens/Source/shotwell/src/Event.vala" result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_COLLECTION, GeeCollection); #line 66 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 66 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1518 "Event.c" +#line 1778 "Event.c" } -static ContainerSource* event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, SourceBacklink* backlink) { +static ContainerSource* +event_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* base, + SourceBacklink* backlink) +{ EventSourceCollection * self; ContainerSource* result = NULL; EventID event_id = {0}; - SourceBacklink* _tmp0_; + gint64 _tmp0_; gint64 _tmp1_; - gint64 _tmp2_; Event* event = NULL; - EventID _tmp3_; + EventID _tmp2_; + Event* _tmp3_; Event* _tmp4_; - Event* _tmp5_; #line 69 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); #line 69 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), NULL); #line 70 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = backlink; + _tmp0_ = source_backlink_get_instance_id (backlink); #line 70 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source_backlink_get_instance_id (_tmp0_); -#line 70 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 70 "/home/jens/Source/shotwell/src/Event.vala" - event_id_init (&event_id, _tmp2_); + event_id_init (&event_id, _tmp1_); #line 72 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_id; + _tmp2_ = event_id; #line 72 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_source_collection_fetch (self, &_tmp3_); + _tmp3_ = event_source_collection_fetch (self, &_tmp2_); #line 72 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp4_; + event = _tmp3_; #line 73 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event; + _tmp4_ = event; #line 73 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_ != NULL) { + if (_tmp4_ != NULL) { #line 74 "/home/jens/Source/shotwell/src/Event.vala" result = G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_CONTAINER_SOURCE, ContainerSource); #line 74 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1559 "Event.c" +#line 1819 "Event.c" } { GeeIterator* _container_it = NULL; + GeeCollection* _tmp5_; GeeCollection* _tmp6_; - GeeCollection* _tmp7_; + GeeIterator* _tmp7_; GeeIterator* _tmp8_; - GeeIterator* _tmp9_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); + _tmp5_ = container_source_collection_get_holding_tank (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection)); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _container_it = _tmp9_; + _container_it = _tmp8_; #line 76 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 1581 "Event.c" - GeeIterator* _tmp10_; - gboolean _tmp11_; +#line 1841 "Event.c" + GeeIterator* _tmp9_; ContainerSource* container = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - ContainerSource* _tmp14_; - EventID _tmp15_ = {0}; + GeeIterator* _tmp10_; + gpointer _tmp11_; + ContainerSource* _tmp12_; + EventID _tmp13_ = {0}; + gint64 _tmp14_; + EventID _tmp15_; gint64 _tmp16_; - EventID _tmp17_; - gint64 _tmp18_; -#line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _container_it; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = gee_iterator_next (_tmp10_); + _tmp9_ = _container_it; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp9_)) { #line 76 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 1600 "Event.c" +#line 1857 "Event.c" } #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _container_it; + _tmp10_ = _container_it; #line 76 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 76 "/home/jens/Source/shotwell/src/Event.vala" - container = (ContainerSource*) _tmp13_; + container = (ContainerSource*) _tmp11_; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = container; + _tmp12_ = container; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - event_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event), &_tmp15_); + event_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EVENT, Event), &_tmp13_); #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp15_.id; + _tmp14_ = _tmp13_.id; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = event_id; + _tmp15_ = event_id; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_.id; + _tmp16_ = _tmp15_.id; #line 77 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp16_ == _tmp18_) { + if (_tmp14_ == _tmp16_) { #line 78 "/home/jens/Source/shotwell/src/Event.vala" result = container; #line 78 "/home/jens/Source/shotwell/src/Event.vala" @@ -1624,15 +1881,15 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain _g_object_unref0 (event); #line 78 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1628 "Event.c" +#line 1885 "Event.c" } #line 76 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (container); -#line 1632 "Event.c" +#line 1889 "Event.c" } #line 76 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_container_it); -#line 1636 "Event.c" +#line 1893 "Event.c" } #line 81 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; @@ -1640,11 +1897,13 @@ static ContainerSource* event_source_collection_real_convert_backlink_to_contain _g_object_unref0 (event); #line 81 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1644 "Event.c" +#line 1901 "Event.c" } -GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self) { +GeeCollection* +event_source_collection_get_no_event_objects (EventSourceCollection* self) +{ GeeCollection* result = NULL; ViewCollection* _tmp0_; GeeCollection* _tmp1_; @@ -1658,11 +1917,15 @@ GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollecti result = _tmp1_; #line 85 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1662 "Event.c" +#line 1921 "Event.c" } -static void event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, GeeIterable* added, GeeIterable* removed) { +static void +event_source_collection_on_no_event_collection_altered (EventSourceCollection* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 88 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT_SOURCE_COLLECTION (self)); #line 88 "/home/jens/Source/shotwell/src/Event.vala" @@ -1671,105 +1934,109 @@ static void event_source_collection_on_no_event_collection_altered (EventSourceC g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 90 "/home/jens/Source/shotwell/src/Event.vala" g_signal_emit (self, event_source_collection_signals[EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL], 0); -#line 1675 "Event.c" +#line 1938 "Event.c" } -static gboolean event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +event_source_collection_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ EventSourceCollectionNoEventViewManager * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataSource* _tmp1_; - EventID _tmp2_ = {0}; - gint64 _tmp3_; + EventID _tmp1_ = {0}; + gint64 _tmp2_; #line 13 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER, EventSourceCollectionNoEventViewManager); #line 13 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 15 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; -#line 15 "/home/jens/Source/shotwell/src/Event.vala" - media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_); + media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_); #line 15 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 15 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ != EVENT_ID_INVALID) { + if (_tmp2_ != EVENT_ID_INVALID) { #line 15 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = FALSE; -#line 1700 "Event.c" +#line 1963 "Event.c" } else { - DataSource* _tmp4_; - gboolean _tmp5_; #line 16 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = source; -#line 16 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = VIEW_MANAGER_CLASS (event_source_collection_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIEW_MANAGER, ViewManager), _tmp4_); -#line 16 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp5_; -#line 1710 "Event.c" + _tmp0_ = VIEW_MANAGER_CLASS (event_source_collection_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIEW_MANAGER, ViewManager), source); +#line 1967 "Event.c" } #line 15 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 15 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1716 "Event.c" +#line 1973 "Event.c" } -static DataView* event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +event_source_collection_no_event_view_manager_real_create_view (ViewManager* base, + DataSource* source) +{ EventSourceCollectionNoEventViewManager * self; DataView* result = NULL; - DataSource* _tmp0_; - ThumbnailView* _tmp1_; + ThumbnailView* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER, EventSourceCollectionNoEventViewManager); #line 19 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 20 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 20 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp0_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 20 "/home/jens/Source/shotwell/src/Event.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 20 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1737 "Event.c" +#line 1994 "Event.c" } -static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_construct (GType object_type) { +static EventSourceCollectionNoEventViewManager* +event_source_collection_no_event_view_manager_construct (GType object_type) +{ EventSourceCollectionNoEventViewManager* self = NULL; #line 12 "/home/jens/Source/shotwell/src/Event.vala" self = (EventSourceCollectionNoEventViewManager*) view_manager_construct (object_type); #line 12 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 1747 "Event.c" +#line 2006 "Event.c" } -static EventSourceCollectionNoEventViewManager* event_source_collection_no_event_view_manager_new (void) { +static EventSourceCollectionNoEventViewManager* +event_source_collection_no_event_view_manager_new (void) +{ #line 12 "/home/jens/Source/shotwell/src/Event.vala" return event_source_collection_no_event_view_manager_construct (EVENT_SOURCE_COLLECTION_TYPE_NO_EVENT_VIEW_MANAGER); -#line 1754 "Event.c" +#line 2015 "Event.c" } -static void event_source_collection_no_event_view_manager_class_init (EventSourceCollectionNoEventViewManagerClass * klass) { +static void +event_source_collection_no_event_view_manager_class_init (EventSourceCollectionNoEventViewManagerClass * klass) +{ #line 12 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_no_event_view_manager_parent_class = g_type_class_peek_parent (klass); #line 12 "/home/jens/Source/shotwell/src/Event.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) event_source_collection_no_event_view_manager_real_include_in_view; #line 12 "/home/jens/Source/shotwell/src/Event.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) event_source_collection_no_event_view_manager_real_create_view; -#line 1765 "Event.c" +#line 2028 "Event.c" } -static void event_source_collection_no_event_view_manager_instance_init (EventSourceCollectionNoEventViewManager * self) { +static void +event_source_collection_no_event_view_manager_instance_init (EventSourceCollectionNoEventViewManager * self) +{ } -static GType event_source_collection_no_event_view_manager_get_type (void) { +static GType +event_source_collection_no_event_view_manager_get_type (void) +{ static volatile gsize event_source_collection_no_event_view_manager_type_id__volatile = 0; if (g_once_init_enter (&event_source_collection_no_event_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSourceCollectionNoEventViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_source_collection_no_event_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSourceCollectionNoEventViewManager), 0, (GInstanceInitFunc) event_source_collection_no_event_view_manager_instance_init, NULL }; @@ -1781,7 +2048,9 @@ static GType event_source_collection_no_event_view_manager_get_type (void) { } -static void event_source_collection_class_init (EventSourceCollectionClass * klass) { +static void +event_source_collection_class_init (EventSourceCollectionClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/Event.vala" @@ -1796,18 +2065,22 @@ static void event_source_collection_class_init (EventSourceCollectionClass * kla ((ContainerSourceCollectionClass *) klass)->convert_backlink_to_container = (ContainerSource* (*) (ContainerSourceCollection *, SourceBacklink*)) event_source_collection_real_convert_backlink_to_container; #line 7 "/home/jens/Source/shotwell/src/Event.vala" event_source_collection_signals[EVENT_SOURCE_COLLECTION_NO_EVENT_COLLECTION_ALTERED_SIGNAL] = g_signal_new ("no-event-collection-altered", TYPE_EVENT_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1800 "Event.c" +#line 2069 "Event.c" } -static void event_source_collection_instance_init (EventSourceCollection * self) { +static void +event_source_collection_instance_init (EventSourceCollection * self) +{ #line 7 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_SOURCE_COLLECTION_GET_PRIVATE (self); -#line 1807 "Event.c" +#line 2078 "Event.c" } -static void event_source_collection_finalize (DataCollection * obj) { +static void +event_source_collection_finalize (DataCollection * obj) +{ EventSourceCollection * self; #line 7 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_SOURCE_COLLECTION, EventSourceCollection); @@ -1815,11 +2088,13 @@ static void event_source_collection_finalize (DataCollection * obj) { _data_collection_unref0 (self->priv->no_event); #line 7 "/home/jens/Source/shotwell/src/Event.vala" DATA_COLLECTION_CLASS (event_source_collection_parent_class)->finalize (obj); -#line 1819 "Event.c" +#line 2092 "Event.c" } -GType event_source_collection_get_type (void) { +GType +event_source_collection_get_type (void) +{ static volatile gsize event_source_collection_type_id__volatile = 0; if (g_once_init_enter (&event_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventSourceCollection), 0, (GInstanceInitFunc) event_source_collection_instance_init, NULL }; @@ -1831,433 +2106,437 @@ GType event_source_collection_get_type (void) { } -static void _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, gpointer self) { +static void +_event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered (ThumbnailSource* _sender, + gpointer self) +{ #line 238 "/home/jens/Source/shotwell/src/Event.vala" event_on_primary_thumbnail_altered ((Event*) self); -#line 1838 "Event.c" +#line 2116 "Event.c" } -static void _event_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_event_on_media_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 240 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_altered ((Event*) self, items); -#line 1845 "Event.c" +#line 2127 "Event.c" } -static void _event_on_media_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) { +static void +_event_on_media_removed_data_collection_items_removed (DataCollection* _sender, + GeeIterable* removed, + gpointer self) +{ #line 241 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_removed ((Event*) self, removed); -#line 1852 "Event.c" +#line 2138 "Event.c" } -static void _event_on_media_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) { +static void +_event_on_media_added_data_collection_items_added (DataCollection* _sender, + GeeIterable* added, + gpointer self) +{ #line 242 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_added ((Event*) self, added); -#line 1859 "Event.c" +#line 2149 "Event.c" } -static void _event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_event_on_media_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 244 "/home/jens/Source/shotwell/src/Event.vala" event_on_media_destroyed ((Event*) self, source); -#line 1866 "Event.c" +#line 2160 "Event.c" } -static gint64 _event_view_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_event_view_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = event_view_comparator (a, b); #line 201 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1875 "Event.c" +#line 2173 "Event.c" } -static gboolean _event_view_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_event_view_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = event_view_comparator_predicate (object, alteration); #line 201 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 1884 "Event.c" +#line 2186 "Event.c" } -static Event* event_construct (GType object_type, EventRow* event_row, gint64 object_id) { +static Event* +event_construct (GType object_type, + EventRow* event_row, + gint64 object_id) +{ Event * self = NULL; - gint64 _tmp0_; - EventRow* _tmp1_; - EventRow* _tmp2_; + const gchar* _tmp0_; + gchar* _tmp1_; + EventID _tmp2_; const gchar* _tmp3_; gchar* _tmp4_; - EventRow* _tmp5_; - EventID _tmp6_; - EventRow* _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - EventRow* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; + const gchar* _tmp5_; + gchar* _tmp6_; GeeCollection* event_source_ids = NULL; - MediaCollectionRegistry* _tmp13_; - MediaCollectionRegistry* _tmp14_; - EventID _tmp15_; - GeeCollection* _tmp16_; - GeeCollection* _tmp17_; + MediaCollectionRegistry* _tmp7_; + MediaCollectionRegistry* _tmp8_; + EventID _tmp9_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; GeeArrayList* event_thumbs = NULL; - GeeArrayList* _tmp18_; - EventID _tmp35_; - gint64 _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - ViewCollection* _tmp41_; - ViewCollection* _tmp42_; - ViewCollection* _tmp43_; - GeeArrayList* _tmp44_; - GeeCollection* _tmp45_; - GeeCollection* _tmp46_; - GeeArrayList* _tmp47_; - gint _tmp48_; - gint _tmp49_; - MediaCollectionRegistry* _tmp54_; - MediaCollectionRegistry* _tmp55_; - EventRow* _tmp56_; - const gchar* _tmp57_; - MediaSource* _tmp58_; - gboolean _tmp59_ = FALSE; - MediaSource* _tmp60_; - MediaSource* _tmp72_; - ViewCollection* _tmp74_; - ViewCollection* _tmp75_; - ViewCollection* _tmp76_; - LibraryPhotoSourceCollection* _tmp77_; - VideoSourceCollection* _tmp78_; + GeeArrayList* _tmp12_; + EventID _tmp28_; + gint64 _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + ViewCollection* _tmp34_; + ViewCollection* _tmp35_; + ViewCollection* _tmp36_; + GeeArrayList* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; + GeeArrayList* _tmp40_; + gint _tmp41_; + gint _tmp42_; + MediaCollectionRegistry* _tmp47_; + MediaCollectionRegistry* _tmp48_; + const gchar* _tmp49_; + MediaSource* _tmp50_; + gboolean _tmp51_ = FALSE; + MediaSource* _tmp52_; + MediaSource* _tmp63_; + ViewCollection* _tmp65_; + ViewCollection* _tmp66_; + ViewCollection* _tmp67_; + LibraryPhotoSourceCollection* _tmp68_; + VideoSourceCollection* _tmp69_; #line 180 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT_ROW (event_row), NULL); #line 181 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = object_id; -#line 181 "/home/jens/Source/shotwell/src/Event.vala" - self = (Event*) event_source_construct (object_type, _tmp0_); -#line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_row; + self = (Event*) event_source_construct (object_type, object_id); #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_row; + _tmp0_ = event_row->name; #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_->name; -#line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_prep_event_name (_tmp3_); + _tmp1_ = event_prep_event_name (_tmp0_); #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp1_->name); + _g_free0 (event_row->name); #line 184 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_->name = _tmp4_; + event_row->name = _tmp1_; #line 186 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_row; + _tmp2_ = event_row->event_id; #line 186 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _tmp5_->event_id; -#line 186 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->event_id = _tmp6_; -#line 187 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event_row; + self->priv->event_id = _tmp2_; #line 187 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_->name; + _tmp3_ = event_row->name; #line 187 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = g_strdup (_tmp8_); + _tmp4_ = g_strdup (_tmp3_); #line 187 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->raw_name); #line 187 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->raw_name = _tmp9_; + self->priv->raw_name = _tmp4_; #line 188 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = event_row; + _tmp5_ = event_row->comment; #line 188 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_->comment; -#line 188 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp6_ = g_strdup (_tmp5_); #line 188 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->comment); #line 188 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->comment = _tmp12_; + self->priv->comment = _tmp6_; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = media_collection_registry_get_instance (); + _tmp7_ = media_collection_registry_get_instance (); #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = self->priv->event_id; + _tmp9_ = self->priv->event_id; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = media_collection_registry_get_source_ids_for_event_id (_tmp14_, &_tmp15_); + _tmp10_ = media_collection_registry_get_source_ids_for_event_id (_tmp8_, &_tmp9_); #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 190 "/home/jens/Source/shotwell/src/Event.vala" - _media_collection_registry_unref0 (_tmp14_); + _media_collection_registry_unref0 (_tmp8_); #line 190 "/home/jens/Source/shotwell/src/Event.vala" - event_source_ids = _tmp17_; + event_source_ids = _tmp11_; #line 192 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp12_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 192 "/home/jens/Source/shotwell/src/Event.vala" - event_thumbs = _tmp18_; -#line 2001 "Event.c" + event_thumbs = _tmp12_; +#line 2288 "Event.c" { GeeIterator* _current_source_id_it = NULL; - GeeCollection* _tmp19_; - GeeIterator* _tmp20_; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = event_source_ids; + _tmp13_ = event_source_ids; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_id_it = _tmp20_; + _current_source_id_it = _tmp14_; #line 193 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2014 "Event.c" - GeeIterator* _tmp21_; - gboolean _tmp22_; +#line 2301 "Event.c" + GeeIterator* _tmp15_; gchar* current_source_id = NULL; - GeeIterator* _tmp23_; - gpointer _tmp24_; + GeeIterator* _tmp16_; + gpointer _tmp17_; MediaSource* media = NULL; - MediaCollectionRegistry* _tmp25_; - MediaCollectionRegistry* _tmp26_; - const gchar* _tmp27_; - MediaSource* _tmp28_; - MediaSource* _tmp29_; - MediaSource* _tmp30_; -#line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = _current_source_id_it; + MediaCollectionRegistry* _tmp18_; + MediaCollectionRegistry* _tmp19_; + const gchar* _tmp20_; + MediaSource* _tmp21_; + MediaSource* _tmp22_; + MediaSource* _tmp23_; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = gee_iterator_next (_tmp21_); + _tmp15_ = _current_source_id_it; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp22_) { + if (!gee_iterator_next (_tmp15_)) { #line 193 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2035 "Event.c" +#line 2319 "Event.c" } #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = _current_source_id_it; + _tmp16_ = _current_source_id_it; #line 193 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = gee_iterator_get (_tmp23_); + _tmp17_ = gee_iterator_get (_tmp16_); #line 193 "/home/jens/Source/shotwell/src/Event.vala" - current_source_id = (gchar*) _tmp24_; + current_source_id = (gchar*) _tmp17_; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = media_collection_registry_get_instance (); + _tmp18_ = media_collection_registry_get_instance (); #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = _tmp25_; + _tmp19_ = _tmp18_; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = current_source_id; + _tmp20_ = current_source_id; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = media_collection_registry_fetch_media (_tmp26_, _tmp27_); + _tmp21_ = media_collection_registry_fetch_media (_tmp19_, _tmp20_); #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 194 "/home/jens/Source/shotwell/src/Event.vala" - _media_collection_registry_unref0 (_tmp26_); + _media_collection_registry_unref0 (_tmp19_); #line 194 "/home/jens/Source/shotwell/src/Event.vala" - media = _tmp29_; + media = _tmp22_; #line 196 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = media; + _tmp23_ = media; #line 196 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp30_ != NULL) { -#line 2061 "Event.c" - GeeArrayList* _tmp31_; - MediaSource* _tmp32_; - ThumbnailView* _tmp33_; - ThumbnailView* _tmp34_; + if (_tmp23_ != NULL) { +#line 2345 "Event.c" + GeeArrayList* _tmp24_; + MediaSource* _tmp25_; + ThumbnailView* _tmp26_; + ThumbnailView* _tmp27_; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = event_thumbs; + _tmp24_ = event_thumbs; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = media; + _tmp25_ = media; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp26_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = _tmp33_; + _tmp27_ = _tmp26_; #line 197 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp34_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); #line 197 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp34_); -#line 2078 "Event.c" + _g_object_unref0 (_tmp27_); +#line 2362 "Event.c" } #line 193 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 193 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (current_source_id); -#line 2084 "Event.c" +#line 2368 "Event.c" } #line 193 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_id_it); -#line 2088 "Event.c" +#line 2372 "Event.c" } #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp35_ = self->priv->event_id; + _tmp28_ = self->priv->event_id; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp36_ = _tmp35_.id; + _tmp29_ = _tmp28_.id; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp37_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp36_); + _tmp30_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp29_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp38_ = _tmp37_; + _tmp31_ = _tmp30_; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp39_ = g_strdup_printf ("ViewCollection for Event %s", _tmp38_); + _tmp32_ = g_strdup_printf ("ViewCollection for Event %s", _tmp31_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp40_ = _tmp39_; + _tmp33_ = _tmp32_; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _tmp41_ = view_collection_new (_tmp40_); + _tmp34_ = view_collection_new (_tmp33_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" _data_collection_unref0 (self->priv->view); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->view = _tmp41_; + self->priv->view = _tmp34_; #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp40_); + _g_free0 (_tmp33_); #line 200 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp31_); #line 201 "/home/jens/Source/shotwell/src/Event.vala" - _tmp42_ = self->priv->view; + _tmp35_ = self->priv->view; #line 201 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _event_view_comparator_comparator, NULL, _event_view_comparator_predicate_comparator_predicate, NULL); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_COLLECTION, DataCollection), _event_view_comparator_comparator, NULL, _event_view_comparator_predicate_comparator_predicate, NULL); #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp43_ = self->priv->view; + _tmp36_ = self->priv->view; #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp44_ = event_thumbs; + _tmp37_ = event_thumbs; #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp45_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp38_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _tmp46_ = _tmp45_; + _tmp39_ = _tmp38_; #line 202 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp39_); #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp47_ = event_thumbs; + _tmp40_ = event_thumbs; #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp48_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp41_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 206 "/home/jens/Source/shotwell/src/Event.vala" - _tmp49_ = _tmp48_; + _tmp42_ = _tmp41_; #line 206 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp49_ > 0) { -#line 2134 "Event.c" - EventSourceCollection* _tmp50_; - GeeArrayList* _tmp51_; - EventSourceCollection* _tmp52_; - GeeArrayList* _tmp53_; + if (_tmp42_ > 0) { +#line 2418 "Event.c" + EventSourceCollection* _tmp43_; + GeeArrayList* _tmp44_; + EventSourceCollection* _tmp45_; + GeeArrayList* _tmp46_; #line 207 "/home/jens/Source/shotwell/src/Event.vala" - _tmp50_ = event_global; + _tmp43_ = event_global; #line 207 "/home/jens/Source/shotwell/src/Event.vala" - _tmp51_ = event_thumbs; + _tmp44_ = event_thumbs; #line 207 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); + container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), FALSE); #line 208 "/home/jens/Source/shotwell/src/Event.vala" - _tmp52_ = event_global; + _tmp45_ = event_global; #line 208 "/home/jens/Source/shotwell/src/Event.vala" - _tmp53_ = event_thumbs; + _tmp46_ = event_thumbs; #line 208 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE); -#line 2151 "Event.c" + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, FALSE); +#line 2435 "Event.c" } #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp54_ = media_collection_registry_get_instance (); -#line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp55_ = _tmp54_; + _tmp47_ = media_collection_registry_get_instance (); #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp56_ = event_row; + _tmp48_ = _tmp47_; #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp57_ = _tmp56_->primary_source_id; + _tmp49_ = event_row->primary_source_id; #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _tmp58_ = media_collection_registry_fetch_media (_tmp55_, _tmp57_); + _tmp50_ = media_collection_registry_fetch_media (_tmp48_, _tmp49_); #line 213 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 213 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = _tmp58_; + self->priv->primary_source = _tmp50_; #line 213 "/home/jens/Source/shotwell/src/Event.vala" - _media_collection_registry_unref0 (_tmp55_); + _media_collection_registry_unref0 (_tmp48_); #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp60_ = self->priv->primary_source; + _tmp52_ = self->priv->primary_source; #line 214 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp60_ == NULL) { -#line 2173 "Event.c" - ViewCollection* _tmp61_; - gint _tmp62_; -#line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp61_ = self->priv->view; + if (_tmp52_ == NULL) { +#line 2455 "Event.c" + ViewCollection* _tmp53_; #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp62_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp53_ = self->priv->view; #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp59_ = _tmp62_ > 0; -#line 2182 "Event.c" + _tmp51_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection)) > 0; +#line 2461 "Event.c" } else { #line 214 "/home/jens/Source/shotwell/src/Event.vala" - _tmp59_ = FALSE; -#line 2186 "Event.c" + _tmp51_ = FALSE; +#line 2465 "Event.c" } #line 214 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp59_) { -#line 2190 "Event.c" - ViewCollection* _tmp63_; - DataView* _tmp64_; - DataView* _tmp65_; - DataSource* _tmp66_; - EventTable* _tmp67_; - EventID _tmp68_; - MediaSource* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; + if (_tmp51_) { +#line 2469 "Event.c" + ViewCollection* _tmp54_; + DataView* _tmp55_; + DataView* _tmp56_; + DataSource* _tmp57_; + EventTable* _tmp58_; + EventID _tmp59_; + MediaSource* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp63_ = self->priv->view; + _tmp54_ = self->priv->view; #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp64_ = view_collection_get_first_unrejected (_tmp63_); + _tmp55_ = view_collection_get_first_unrejected (_tmp54_); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_DATA_VIEW, DataView); + _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_VIEW, DataView); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _tmp66_ = data_view_get_source (_tmp65_); + _tmp57_ = data_view_get_source (_tmp56_); #line 215 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_MEDIA_SOURCE, MediaSource); + self->priv->primary_source = G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_MEDIA_SOURCE, MediaSource); #line 215 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp65_); + _g_object_unref0 (_tmp56_); #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp67_ = event_event_table; + _tmp58_ = event_event_table; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp68_ = self->priv->event_id; + _tmp59_ = self->priv->event_id; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp69_ = self->priv->primary_source; + _tmp60_ = self->priv->primary_source; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp70_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_DATA_SOURCE, DataSource)); + _tmp61_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_SOURCE, DataSource)); #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _tmp71_ = _tmp70_; + _tmp62_ = _tmp61_; #line 216 "/home/jens/Source/shotwell/src/Event.vala" - event_table_set_primary_source_id (_tmp67_, &_tmp68_, _tmp71_); + event_table_set_primary_source_id (_tmp58_, &_tmp59_, _tmp62_); #line 216 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp71_); -#line 2228 "Event.c" + _g_free0 (_tmp62_); +#line 2507 "Event.c" } #line 220 "/home/jens/Source/shotwell/src/Event.vala" - _tmp72_ = self->priv->primary_source; + _tmp63_ = self->priv->primary_source; #line 220 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp72_ != NULL) { -#line 2234 "Event.c" - MediaSource* _tmp73_; + if (_tmp63_ != NULL) { +#line 2513 "Event.c" + MediaSource* _tmp64_; #line 221 "/home/jens/Source/shotwell/src/Event.vala" - _tmp73_ = self->priv->primary_source; + _tmp64_ = self->priv->primary_source; #line 221 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0); -#line 2240 "Event.c" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0); +#line 2519 "Event.c" } #line 224 "/home/jens/Source/shotwell/src/Event.vala" - _tmp74_ = self->priv->view; + _tmp65_ = self->priv->view; #line 224 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _event_on_media_added_data_collection_items_added, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_COLLECTION, DataCollection), "items-added", (GCallback) _event_on_media_added_data_collection_items_added, self, 0); #line 225 "/home/jens/Source/shotwell/src/Event.vala" - _tmp75_ = self->priv->view; + _tmp66_ = self->priv->view; #line 225 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _event_on_media_removed_data_collection_items_removed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _event_on_media_removed_data_collection_items_removed, self, 0); #line 226 "/home/jens/Source/shotwell/src/Event.vala" - _tmp76_ = self->priv->view; + _tmp67_ = self->priv->view; #line 226 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_on_media_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_on_media_altered_data_collection_items_altered, self, 0); #line 230 "/home/jens/Source/shotwell/src/Event.vala" - _tmp77_ = library_photo_global; + _tmp68_ = library_photo_global; #line 230 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); #line 231 "/home/jens/Source/shotwell/src/Event.vala" - _tmp78_ = video_global; + _tmp69_ = video_global; #line 231 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_on_media_destroyed_source_collection_item_destroyed, self, 0); #line 233 "/home/jens/Source/shotwell/src/Event.vala" event_update_indexable_keywords (self); #line 180 "/home/jens/Source/shotwell/src/Event.vala" @@ -2266,18 +2545,23 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob _g_object_unref0 (event_source_ids); #line 180 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 2270 "Event.c" +#line 2549 "Event.c" } -static Event* event_new (EventRow* event_row, gint64 object_id) { +static Event* +event_new (EventRow* event_row, + gint64 object_id) +{ #line 180 "/home/jens/Source/shotwell/src/Event.vala" return event_construct (TYPE_EVENT, event_row, object_id); -#line 2277 "Event.c" +#line 2559 "Event.c" } -static gchar* event_real_get_typename (DataSource* base) { +static gchar* +event_real_get_typename (DataSource* base) +{ Event * self; gchar* result = NULL; gchar* _tmp0_; @@ -2289,11 +2573,13 @@ static gchar* event_real_get_typename (DataSource* base) { result = _tmp0_; #line 249 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2293 "Event.c" +#line 2577 "Event.c" } -static gint64 event_real_get_instance_id (DataSource* base) { +static gint64 +event_real_get_instance_id (DataSource* base) +{ Event * self; gint64 result = 0LL; EventID _tmp0_ = {0}; @@ -2308,11 +2594,13 @@ static gint64 event_real_get_instance_id (DataSource* base) { result = _tmp1_; #line 253 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2312 "Event.c" +#line 2598 "Event.c" } -static gchar* event_real_get_representative_id (ThumbnailSource* base) { +static gchar* +event_real_get_representative_id (ThumbnailSource* base) +{ Event * self; gchar* result = NULL; gchar* _tmp0_ = NULL; @@ -2323,7 +2611,7 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) { _tmp1_ = self->priv->primary_source; #line 257 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 2327 "Event.c" +#line 2615 "Event.c" MediaSource* _tmp2_; gchar* _tmp3_; #line 257 "/home/jens/Source/shotwell/src/Event.vala" @@ -2334,7 +2622,7 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) { _g_free0 (_tmp0_); #line 257 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = _tmp3_; -#line 2338 "Event.c" +#line 2626 "Event.c" } else { gchar* _tmp4_; #line 257 "/home/jens/Source/shotwell/src/Event.vala" @@ -2343,17 +2631,19 @@ static gchar* event_real_get_representative_id (ThumbnailSource* base) { _g_free0 (_tmp0_); #line 257 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = _tmp4_; -#line 2347 "Event.c" +#line 2635 "Event.c" } #line 257 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 257 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2353 "Event.c" +#line 2641 "Event.c" } -static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSource* base) { +static PhotoFileFormat +event_real_get_preferred_thumbnail_format (ThumbnailSource* base) +{ Event * self; PhotoFileFormat result = 0; PhotoFileFormat _tmp0_ = 0; @@ -2364,33 +2654,31 @@ static PhotoFileFormat event_real_get_preferred_thumbnail_format (ThumbnailSourc _tmp1_ = self->priv->primary_source; #line 261 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 2368 "Event.c" +#line 2658 "Event.c" MediaSource* _tmp2_; - PhotoFileFormat _tmp3_; #line 261 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->primary_source; #line 261 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = thumbnail_source_get_preferred_thumbnail_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 261 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp3_; -#line 2377 "Event.c" + _tmp0_ = thumbnail_source_get_preferred_thumbnail_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); +#line 2664 "Event.c" } else { - PhotoFileFormat _tmp4_; #line 262 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = photo_file_format_get_system_default_format (); -#line 262 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp4_; -#line 2384 "Event.c" + _tmp0_ = photo_file_format_get_system_default_format (); +#line 2668 "Event.c" } #line 261 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 261 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2390 "Event.c" +#line 2674 "Event.c" } -static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +event_real_create_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Event * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -2402,20 +2690,17 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale _tmp1_ = self->priv->primary_source; #line 266 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 2406 "Event.c" +#line 2694 "Event.c" MediaSource* _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp3_; #line 266 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->primary_source; #line 266 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = scale; -#line 266 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, &_inner_error_); + _tmp3_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 266 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jens/Source/shotwell/src/Event.vala" @@ -2424,24 +2709,27 @@ static GdkPixbuf* event_real_create_thumbnail (ThumbnailSource* base, gint scale _g_object_unref0 (_tmp0_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 2428 "Event.c" +#line 2713 "Event.c" } } else { #line 266 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 266 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = NULL; -#line 2435 "Event.c" +#line 2720 "Event.c" } #line 266 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 266 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2441 "Event.c" +#line 2726 "Event.c" } -void event_init (ProgressMonitor monitor, void* monitor_target) { +void +event_init (ProgressMonitor monitor, + void* monitor_target) +{ EventTable* _tmp0_; EventSourceCollection* _tmp1_; EventSourceCollection* _tmp2_; @@ -2456,12 +2744,12 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { GeeArrayList* _tmp7_; gint _tmp8_; gint _tmp9_; - EventSourceCollection* _tmp32_; - GeeArrayList* _tmp33_; - GeeCollection* _tmp34_; - GeeCollection* _tmp35_; - EventSourceCollection* _tmp36_; - GeeArrayList* _tmp37_; + EventSourceCollection* _tmp29_; + GeeArrayList* _tmp30_; + GeeCollection* _tmp31_; + GeeCollection* _tmp32_; + EventSourceCollection* _tmp33_; + GeeArrayList* _tmp34_; #line 270 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = event_table_get_instance (); #line 270 "/home/jens/Source/shotwell/src/Event.vala" @@ -2500,19 +2788,19 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { _tmp9_ = _tmp8_; #line 279 "/home/jens/Source/shotwell/src/Event.vala" count = _tmp9_; -#line 2504 "Event.c" +#line 2792 "Event.c" { gint ctr = 0; #line 280 "/home/jens/Source/shotwell/src/Event.vala" ctr = 0; -#line 2509 "Event.c" +#line 2797 "Event.c" { gboolean _tmp10_ = FALSE; #line 280 "/home/jens/Source/shotwell/src/Event.vala" _tmp10_ = TRUE; #line 280 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2516 "Event.c" +#line 2804 "Event.c" gint _tmp12_; gint _tmp13_; Event* event = NULL; @@ -2522,23 +2810,20 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { EventRow* _tmp17_; Event* _tmp18_; Event* _tmp19_; - ProgressMonitor _tmp20_; - void* _tmp20__target; - Event* _tmp24_; - gint _tmp25_; + Event* _tmp22_; + Event* _tmp25_; + EventSourceCollection* _tmp26_; + GeeArrayList* _tmp27_; Event* _tmp28_; - EventSourceCollection* _tmp29_; - GeeArrayList* _tmp30_; - Event* _tmp31_; #line 280 "/home/jens/Source/shotwell/src/Event.vala" if (!_tmp10_) { -#line 2536 "Event.c" +#line 2821 "Event.c" gint _tmp11_; #line 280 "/home/jens/Source/shotwell/src/Event.vala" _tmp11_ = ctr; #line 280 "/home/jens/Source/shotwell/src/Event.vala" ctr = _tmp11_ + 1; -#line 2542 "Event.c" +#line 2827 "Event.c" } #line 280 "/home/jens/Source/shotwell/src/Event.vala" _tmp10_ = FALSE; @@ -2550,7 +2835,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { if (!(_tmp12_ < _tmp13_)) { #line 280 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2554 "Event.c" +#line 2839 "Event.c" } #line 281 "/home/jens/Source/shotwell/src/Event.vala" _tmp14_ = event_rows; @@ -2569,179 +2854,158 @@ void event_init (ProgressMonitor monitor, void* monitor_target) { #line 281 "/home/jens/Source/shotwell/src/Event.vala" event = _tmp19_; #line 282 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = monitor; -#line 282 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20__target = monitor_target; -#line 282 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp20_ != NULL) { -#line 2578 "Event.c" - ProgressMonitor _tmp21_; - void* _tmp21__target; - gint _tmp22_; - gint _tmp23_; -#line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = monitor; + if (monitor != NULL) { +#line 2859 "Event.c" + gint _tmp20_; + gint _tmp21_; #line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21__target = monitor_target; + _tmp20_ = ctr; #line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = ctr; + _tmp21_ = count; #line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = count; -#line 283 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ ((guint64) _tmp22_, (guint64) _tmp23_, TRUE, _tmp21__target); -#line 2593 "Event.c" + monitor ((guint64) _tmp20_, (guint64) _tmp21_, TRUE, monitor_target); +#line 2868 "Event.c" } #line 285 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = event; -#line 285 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_SOURCE, EventSource)); + _tmp22_ = event; #line 285 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp25_ != 0) { -#line 2601 "Event.c" - GeeArrayList* _tmp26_; - Event* _tmp27_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT_SOURCE, EventSource)) != 0) { +#line 2874 "Event.c" + GeeArrayList* _tmp23_; + Event* _tmp24_; #line 286 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = events; + _tmp23_ = events; #line 286 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = event; + _tmp24_ = event; #line 286 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_); #line 288 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 288 "/home/jens/Source/shotwell/src/Event.vala" continue; -#line 2614 "Event.c" +#line 2887 "Event.c" } #line 294 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = event; + _tmp25_ = event; #line 294 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = event_global; + _tmp26_ = event_global; #line 294 "/home/jens/Source/shotwell/src/Event.vala" - data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection), NULL); + data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_SOURCE_COLLECTION, SourceCollection), NULL); #line 295 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = unlinked; + _tmp27_ = unlinked; #line 295 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = event; + _tmp28_ = event; #line 295 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp31_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_); #line 280 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); -#line 2630 "Event.c" +#line 2903 "Event.c" } } } #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = event_global; + _tmp29_ = event_global; #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = events; + _tmp30_ = events; #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp31_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 298 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp35_); + _g_object_unref0 (_tmp32_); #line 299 "/home/jens/Source/shotwell/src/Event.vala" - _tmp36_ = event_global; + _tmp33_ = event_global; #line 299 "/home/jens/Source/shotwell/src/Event.vala" - _tmp37_ = unlinked; + _tmp34_ = unlinked; #line 299 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_init_add_many_unlinked (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection)); + container_source_collection_init_add_many_unlinked (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection)); #line 269 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event_rows); #line 269 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (unlinked); #line 269 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (events); -#line 2656 "Event.c" +#line 2929 "Event.c" } -void event_terminate (void) { +void +event_terminate (void) +{ } -static gint64 event_view_comparator (void* a, void* b) { +static gint64 +event_view_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - DataSource* _tmp1_; - MediaSource* _tmp2_; - time_t _tmp3_; - void* _tmp4_; - DataSource* _tmp5_; - MediaSource* _tmp6_; - time_t _tmp7_; - gint64 _tmp8_; -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = a; -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) _tmp0_, TYPE_DATA_VIEW, DataView)); -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource); -#line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = media_source_get_exposure_time (_tmp2_); + DataSource* _tmp0_; + MediaSource* _tmp1_; + DataSource* _tmp2_; + MediaSource* _tmp3_; + gint64 _tmp4_; #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = b; + _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) a, TYPE_DATA_VIEW, DataView)); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) _tmp4_, TYPE_DATA_VIEW, DataView)); + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp2_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST ((ThumbnailView*) b, TYPE_DATA_VIEW, DataView)); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = media_source_get_exposure_time (_tmp6_); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = (gint64) (_tmp3_ - _tmp7_); + _tmp4_ = (gint64) (media_source_get_exposure_time (_tmp1_) - media_source_get_exposure_time (_tmp3_)); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp3_); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 306 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp8_; + result = _tmp4_; #line 306 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2701 "Event.c" +#line 2967 "Event.c" } -static gboolean event_view_comparator_predicate (DataObject* object, Alteration* alteration) { +static gboolean +event_view_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 310 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 310 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 311 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = alteration; -#line 311 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time"); -#line 311 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "exposure-time"); #line 311 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2721 "Event.c" +#line 2984 "Event.c" } -gchar* event_prep_event_name (const gchar* name) { +gchar* +event_prep_event_name (const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 319 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = name; + gchar* _tmp0_; #line 319 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = prepare_input_text (_tmp0_, (((PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE | PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) | PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) | PREPARE_INPUT_TEXT_OPTIONS_STRIP) | PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF, DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp0_ = prepare_input_text (name, (((PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE | PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) | PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) | PREPARE_INPUT_TEXT_OPTIONS_STRIP) | PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 319 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = _tmp0_; #line 319 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 2737 "Event.c" +#line 2999 "Event.c" } -void event_attach (Event* self, MediaSource* source) { +void +event_attach (Event* self, + MediaSource* source) +{ ViewCollection* _tmp0_; - MediaSource* _tmp1_; + ThumbnailView* _tmp1_; ThumbnailView* _tmp2_; - ThumbnailView* _tmp3_; #line 327 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 327 "/home/jens/Source/shotwell/src/Event.vala" @@ -2749,26 +3013,27 @@ void event_attach (Event* self, MediaSource* source) { #line 328 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 328 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; -#line 328 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp1_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 328 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 328 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject)); #line 328 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp3_); -#line 2762 "Event.c" + _g_object_unref0 (_tmp2_); +#line 3024 "Event.c" } -void event_attach_many (Event* self, GeeCollection* media) { +void +event_attach_many (Event* self, + GeeCollection* media) +{ GeeArrayList* views = NULL; GeeArrayList* _tmp0_; - ViewCollection* _tmp11_; - GeeArrayList* _tmp12_; - GeeCollection* _tmp13_; - GeeCollection* _tmp14_; + ViewCollection* _tmp9_; + GeeArrayList* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; #line 331 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 331 "/home/jens/Source/shotwell/src/Event.vala" @@ -2777,90 +3042,86 @@ void event_attach_many (Event* self, GeeCollection* media) { _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 332 "/home/jens/Source/shotwell/src/Event.vala" views = _tmp0_; -#line 2781 "Event.c" +#line 3046 "Event.c" { GeeIterator* _current_source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media; + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 333 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_it = _tmp2_; + _current_source_it = _tmp1_; #line 333 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2794 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3056 "Event.c" + GeeIterator* _tmp2_; MediaSource* current_source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - GeeArrayList* _tmp7_; - MediaSource* _tmp8_; - ThumbnailView* _tmp9_; - ThumbnailView* _tmp10_; -#line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _current_source_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeArrayList* _tmp5_; + MediaSource* _tmp6_; + ThumbnailView* _tmp7_; + ThumbnailView* _tmp8_; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _current_source_it; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 333 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2812 "Event.c" +#line 3071 "Event.c" } #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _current_source_it; + _tmp3_ = _current_source_it; #line 333 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 333 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp6_; + current_source = (MediaSource*) _tmp4_; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = views; + _tmp5_ = views; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = current_source; + _tmp6_ = current_source; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); + _tmp7_ = thumbnail_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 334 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 334 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 333 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 2834 "Event.c" +#line 3093 "Event.c" } #line 333 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_it); -#line 2838 "Event.c" +#line 3097 "Event.c" } #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = self->priv->view; + _tmp9_ = self->priv->view; #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = views; + _tmp10_ = views; #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); + _tmp11_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL); #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 336 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp12_); #line 331 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (views); -#line 2852 "Event.c" +#line 3111 "Event.c" } -void event_detach (Event* self, MediaSource* source) { +void +event_detach (Event* self, + MediaSource* source) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; ViewCollection* _tmp2_; - MediaSource* _tmp3_; + DataView* _tmp3_; DataView* _tmp4_; - DataView* _tmp5_; + Marker* _tmp5_; Marker* _tmp6_; - Marker* _tmp7_; #line 342 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 342 "/home/jens/Source/shotwell/src/Event.vala" @@ -2872,33 +3133,34 @@ void event_detach (Event* self, MediaSource* source) { #line 343 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->view; #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = source; + _tmp3_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); -#line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 343 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 343 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp5_); -#line 2891 "Event.c" + _g_object_unref0 (_tmp4_); +#line 3150 "Event.c" } -void event_detach_many (Event* self, GeeCollection* media) { +void +event_detach_many (Event* self, + GeeCollection* media) +{ GeeArrayList* views = NULL; GeeArrayList* _tmp0_; - ViewCollection* _tmp13_; - ViewCollection* _tmp14_; - GeeArrayList* _tmp15_; - Marker* _tmp16_; - Marker* _tmp17_; + ViewCollection* _tmp11_; + ViewCollection* _tmp12_; + GeeArrayList* _tmp13_; + Marker* _tmp14_; + Marker* _tmp15_; #line 346 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 346 "/home/jens/Source/shotwell/src/Event.vala" @@ -2907,106 +3169,103 @@ void event_detach_many (Event* self, GeeCollection* media) { _tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 347 "/home/jens/Source/shotwell/src/Event.vala" views = _tmp0_; -#line 2911 "Event.c" +#line 3173 "Event.c" { GeeIterator* _current_source_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media; + GeeIterator* _tmp1_; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_it = _tmp2_; + _current_source_it = _tmp1_; #line 348 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 2924 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3183 "Event.c" + GeeIterator* _tmp2_; MediaSource* current_source = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; ThumbnailView* view = NULL; - ViewCollection* _tmp7_; - MediaSource* _tmp8_; - DataView* _tmp9_; - ThumbnailView* _tmp10_; -#line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _current_source_it; + ViewCollection* _tmp5_; + MediaSource* _tmp6_; + DataView* _tmp7_; + ThumbnailView* _tmp8_; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _current_source_it; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 348 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 2943 "Event.c" +#line 3199 "Event.c" } #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _current_source_it; + _tmp3_ = _current_source_it; #line 348 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 348 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp6_; + current_source = (MediaSource*) _tmp4_; #line 349 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = self->priv->view; + _tmp5_ = self->priv->view; #line 349 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = current_source; + _tmp6_ = current_source; #line 349 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = view_collection_get_view_for_source (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource)); #line 349 "/home/jens/Source/shotwell/src/Event.vala" - view = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_THUMBNAIL_VIEW, ThumbnailView); + view = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_THUMBNAIL_VIEW, ThumbnailView); #line 350 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = view; + _tmp8_ = view; #line 350 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp10_ != NULL) { -#line 2963 "Event.c" - GeeArrayList* _tmp11_; - ThumbnailView* _tmp12_; + if (_tmp8_ != NULL) { +#line 3219 "Event.c" + GeeArrayList* _tmp9_; + ThumbnailView* _tmp10_; #line 351 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = views; + _tmp9_ = views; #line 351 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = view; + _tmp10_ = view; #line 351 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp12_); -#line 2972 "Event.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); +#line 3228 "Event.c" } #line 348 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (view); #line 348 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 2978 "Event.c" +#line 3234 "Event.c" } #line 348 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_it); -#line 2982 "Event.c" +#line 3238 "Event.c" } #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = self->priv->view; + _tmp11_ = self->priv->view; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = self->priv->view; + _tmp12_ = self->priv->view; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = views; + _tmp13_ = views; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp14_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection)); #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 354 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), _tmp17_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); #line 354 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp15_); #line 346 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (views); -#line 3000 "Event.c" +#line 3256 "Event.c" } -gboolean event_contains_media_type (Event* self, const gchar* media_type) { +gboolean +event_contains_media_type (Event* self, + const gchar* media_type) +{ gboolean result = FALSE; #line 360 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 360 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (media_type != NULL, FALSE); -#line 3010 "Event.c" +#line 3269 "Event.c" { GeeIterator* _media_it = NULL; GeeCollection* _tmp0_; @@ -3027,47 +3286,41 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) { _media_it = _tmp3_; #line 361 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3031 "Event.c" +#line 3290 "Event.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSource* media = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - MediaSource* _tmp8_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + MediaSource* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; - gboolean _tmp12_; + gboolean _tmp10_; #line 361 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = _media_it; #line 361 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 361 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 361 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3050 "Event.c" +#line 3305 "Event.c" } #line 361 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _media_it; + _tmp5_ = _media_it; #line 361 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 361 "/home/jens/Source/shotwell/src/Event.vala" - media = (MediaSource*) _tmp7_; -#line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media; + media = (MediaSource*) _tmp6_; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource)); + _tmp7_ = media; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource)); #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media_type; + _tmp9_ = _tmp8_; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strcmp0 (_tmp10_, _tmp11_) == 0; + _tmp10_ = g_strcmp0 (_tmp9_, media_type) == 0; #line 362 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 362 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp12_) { + if (_tmp10_) { #line 363 "/home/jens/Source/shotwell/src/Event.vala" result = TRUE; #line 363 "/home/jens/Source/shotwell/src/Event.vala" @@ -3076,25 +3329,28 @@ gboolean event_contains_media_type (Event* self, const gchar* media_type) { _g_object_unref0 (_media_it); #line 363 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3080 "Event.c" +#line 3333 "Event.c" } #line 361 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 3084 "Event.c" +#line 3337 "Event.c" } #line 361 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_media_it); -#line 3088 "Event.c" +#line 3341 "Event.c" } #line 366 "/home/jens/Source/shotwell/src/Event.vala" result = FALSE; #line 366 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3094 "Event.c" +#line 3347 "Event.c" } -static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) { +static GeeArrayList* +event_views_to_media (Event* self, + GeeIterable* views) +{ GeeArrayList* result = NULL; GeeArrayList* media = NULL; GeeArrayList* _tmp0_; @@ -3106,308 +3362,297 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) { _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 370 "/home/jens/Source/shotwell/src/Event.vala" media = _tmp0_; -#line 3110 "Event.c" +#line 3366 "Event.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = views; + _tmp1_ = gee_iterable_iterator (views); #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); -#line 371 "/home/jens/Source/shotwell/src/Event.vala" - _object_it = _tmp2_; + _object_it = _tmp1_; #line 371 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3123 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 3376 "Event.c" + GeeIterator* _tmp2_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - GeeArrayList* _tmp7_; - DataObject* _tmp8_; - DataSource* _tmp9_; - MediaSource* _tmp10_; -#line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _object_it; + GeeIterator* _tmp3_; + gpointer _tmp4_; + GeeArrayList* _tmp5_; + DataObject* _tmp6_; + DataSource* _tmp7_; + MediaSource* _tmp8_; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _object_it; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 371 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3141 "Event.c" +#line 3391 "Event.c" } #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _object_it; + _tmp3_ = _object_it; #line 371 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 371 "/home/jens/Source/shotwell/src/Event.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp4_; #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = media; + _tmp5_ = media; #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = object; + _tmp6_ = object; #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView)); + _tmp7_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_VIEW, DataView)); #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource); #line 372 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); #line 372 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp8_); #line 371 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (object); -#line 3163 "Event.c" +#line 3413 "Event.c" } #line 371 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_object_it); -#line 3167 "Event.c" +#line 3417 "Event.c" } #line 374 "/home/jens/Source/shotwell/src/Event.vala" result = media; #line 374 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3173 "Event.c" +#line 3423 "Event.c" } -static void event_on_media_added (Event* self, GeeIterable* added) { +static void +event_on_media_added (Event* self, + GeeIterable* added) +{ GeeCollection* media = NULL; - GeeIterable* _tmp0_; - GeeArrayList* _tmp1_; - EventSourceCollection* _tmp2_; - gboolean _tmp3_; - EventSourceCollection* _tmp4_; - gboolean _tmp5_; + GeeArrayList* _tmp0_; + EventSourceCollection* _tmp1_; + gboolean _tmp2_; + EventSourceCollection* _tmp3_; + gboolean _tmp4_; + Alteration* _tmp5_; Alteration* _tmp6_; - Alteration* _tmp7_; #line 377 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 377 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); #line 378 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = added; -#line 378 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_views_to_media (self, _tmp0_); + _tmp0_ = event_views_to_media (self, added); #line 378 "/home/jens/Source/shotwell/src/Event.vala" - media = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); + media = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 379 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_global; + _tmp1_ = event_global; #line 379 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = self->priv->relinking; + _tmp2_ = self->priv->relinking; #line 379 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp3_); + container_source_collection_notify_container_contents_added (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp2_); #line 380 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_global; + _tmp3_ = event_global; #line 380 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = self->priv->relinking; + _tmp4_ = self->priv->relinking; #line 380 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp5_, NULL, FALSE); + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), media, _tmp4_, NULL, FALSE); #line 382 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = alteration_new_from_list ("contents:added, metadata:time"); + _tmp5_ = alteration_new_from_list ("contents:added, metadata:time"); #line 382 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 382 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_); #line 382 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp7_); + _alteration_unref0 (_tmp6_); #line 377 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 3219 "Event.c" +#line 3469 "Event.c" } -static void event_on_media_removed (Event* self, GeeIterable* removed) { +static void +event_on_media_removed (Event* self, + GeeIterable* removed) +{ GeeArrayList* media = NULL; - GeeIterable* _tmp0_; - GeeArrayList* _tmp1_; - EventSourceCollection* _tmp2_; - GeeArrayList* _tmp3_; - gboolean _tmp4_; - EventSourceCollection* _tmp5_; - GeeArrayList* _tmp6_; - gboolean _tmp7_; - gint _tmp27_; - Alteration* _tmp29_; - Alteration* _tmp30_; + GeeArrayList* _tmp0_; + EventSourceCollection* _tmp1_; + GeeArrayList* _tmp2_; + gboolean _tmp3_; + EventSourceCollection* _tmp4_; + GeeArrayList* _tmp5_; + gboolean _tmp6_; + Alteration* _tmp26_; + Alteration* _tmp27_; #line 386 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 386 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); #line 387 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = removed; -#line 387 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_views_to_media (self, _tmp0_); + _tmp0_ = event_views_to_media (self, removed); #line 387 "/home/jens/Source/shotwell/src/Event.vala" - media = _tmp1_; + media = _tmp0_; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_global; + _tmp1_ = event_global; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = media; + _tmp2_ = media; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->unlinking; + _tmp3_ = self->priv->unlinking; #line 389 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_); + container_source_collection_notify_container_contents_removed (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_); #line 390 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_global; + _tmp4_ = event_global; #line 390 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = media; + _tmp5_ = media; #line 390 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = self->priv->unlinking; + _tmp6_ = self->priv->unlinking; #line 390 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_); -#line 3262 "Event.c" + container_source_collection_notify_container_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource), NULL, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_); +#line 3511 "Event.c" { GeeArrayList* _current_source_list = NULL; + GeeArrayList* _tmp7_; GeeArrayList* _tmp8_; - GeeArrayList* _tmp9_; gint _current_source_size = 0; - GeeArrayList* _tmp10_; + GeeArrayList* _tmp9_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; gint _current_source_index = 0; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media; + _tmp7_ = media; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _g_object_ref0 (_tmp8_); + _tmp8_ = _g_object_ref0 (_tmp7_); #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_list = _tmp9_; + _current_source_list = _tmp8_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _current_source_list; + _tmp9_ = _current_source_list; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_size = _tmp12_; + _current_source_size = _tmp11_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" _current_source_index = -1; #line 393 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3290 "Event.c" +#line 3539 "Event.c" + gint _tmp12_; gint _tmp13_; gint _tmp14_; - gint _tmp15_; MediaSource* current_source = NULL; - GeeArrayList* _tmp16_; - gint _tmp17_; - gpointer _tmp18_; + GeeArrayList* _tmp15_; + gint _tmp16_; + gpointer _tmp17_; + MediaSource* _tmp18_; MediaSource* _tmp19_; - MediaSource* _tmp20_; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _current_source_index; + _tmp12_ = _current_source_index; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _current_source_index = _tmp13_ + 1; + _current_source_index = _tmp12_ + 1; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _current_source_index; + _tmp13_ = _current_source_index; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _current_source_size; + _tmp14_ = _current_source_size; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - if (!(_tmp14_ < _tmp15_)) { + if (!(_tmp13_ < _tmp14_)) { #line 393 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3312 "Event.c" +#line 3561 "Event.c" } #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _current_source_list; + _tmp15_ = _current_source_list; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = _current_source_index; + _tmp16_ = _current_source_index; #line 393 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_); + _tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_); #line 393 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp18_; + current_source = (MediaSource*) _tmp17_; #line 394 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = current_source; + _tmp18_ = current_source; #line 394 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = self->priv->primary_source; + _tmp19_ = self->priv->primary_source; #line 394 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp19_ == _tmp20_) { -#line 3328 "Event.c" - gint _tmp21_; -#line 395 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); + if (_tmp18_ == _tmp19_) { #line 395 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp21_ > 0) { -#line 3334 "Event.c" - ViewCollection* _tmp22_; - DataView* _tmp23_; - DataView* _tmp24_; - DataSource* _tmp25_; - MediaSource* _tmp26_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)) > 0) { +#line 3579 "Event.c" + ViewCollection* _tmp20_; + DataView* _tmp21_; + DataView* _tmp22_; + DataSource* _tmp23_; + MediaSource* _tmp24_; #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = self->priv->view; + _tmp20_ = self->priv->view; #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = view_collection_get_first_unrejected (_tmp22_); + _tmp21_ = view_collection_get_first_unrejected (_tmp20_); #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = data_view_get_source (_tmp24_); + _tmp23_ = data_view_get_source (_tmp22_); #line 396 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource); #line 396 "/home/jens/Source/shotwell/src/Event.vala" - event_set_primary_source (self, _tmp26_); -#line 396 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp26_); + event_set_primary_source (self, _tmp24_); #line 396 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp24_); -#line 3356 "Event.c" +#line 396 "/home/jens/Source/shotwell/src/Event.vala" + _g_object_unref0 (_tmp22_); +#line 3601 "Event.c" } else { #line 398 "/home/jens/Source/shotwell/src/Event.vala" event_release_primary_source (self); -#line 3360 "Event.c" +#line 3605 "Event.c" } #line 400 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); #line 400 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3366 "Event.c" +#line 3611 "Event.c" } #line 393 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 3370 "Event.c" +#line 3615 "Event.c" } #line 393 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_list); -#line 3374 "Event.c" +#line 3619 "Event.c" } #line 405 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); -#line 405 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp27_ == 0) { -#line 3380 "Event.c" - EventSourceCollection* _tmp28_; + if (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)) == 0) { +#line 3623 "Event.c" + EventSourceCollection* _tmp25_; #line 406 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = event_global; + _tmp25_ = event_global; #line 406 "/home/jens/Source/shotwell/src/Event.vala" - container_source_collection_evaporate (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); + container_source_collection_evaporate (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 410 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 410 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 3390 "Event.c" +#line 3633 "Event.c" } #line 413 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = alteration_new_from_list ("contents:removed, metadata:time"); + _tmp26_ = alteration_new_from_list ("contents:removed, metadata:time"); #line 413 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = _tmp29_; + _tmp27_ = _tmp26_; #line 413 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp30_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp27_); #line 413 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp30_); + _alteration_unref0 (_tmp27_); #line 386 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 3402 "Event.c" +#line 3645 "Event.c" } -static void event_on_media_destroyed (Event* self, DataSource* source) { +static void +event_on_media_destroyed (Event* self, + DataSource* source) +{ ThumbnailView* thumbnail_view = NULL; ViewCollection* _tmp0_; - DataSource* _tmp1_; - DataView* _tmp2_; - ThumbnailView* _tmp3_; + DataView* _tmp1_; + ThumbnailView* _tmp2_; #line 416 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 416 "/home/jens/Source/shotwell/src/Event.vala" @@ -3415,89 +3660,84 @@ static void event_on_media_destroyed (Event* self, DataSource* source) { #line 417 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 417 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; + _tmp1_ = view_collection_get_view_for_source (_tmp0_, source); #line 417 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = view_collection_get_view_for_source (_tmp0_, _tmp1_); -#line 417 "/home/jens/Source/shotwell/src/Event.vala" - thumbnail_view = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_VIEW, ThumbnailView); + thumbnail_view = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_VIEW, ThumbnailView); #line 418 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = thumbnail_view; + _tmp2_ = thumbnail_view; #line 418 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ != NULL) { -#line 3428 "Event.c" + if (_tmp2_ != NULL) { +#line 3671 "Event.c" + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - ThumbnailView* _tmp6_; + ThumbnailView* _tmp5_; + Marker* _tmp6_; Marker* _tmp7_; - Marker* _tmp8_; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->view; + _tmp3_ = self->priv->view; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = self->priv->view; + _tmp4_ = self->priv->view; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = thumbnail_view; + _tmp5_ = thumbnail_view; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 419 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), _tmp8_); + data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); #line 419 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp8_); -#line 3448 "Event.c" + _g_object_unref0 (_tmp7_); +#line 3691 "Event.c" } #line 416 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (thumbnail_view); -#line 3452 "Event.c" +#line 3695 "Event.c" } -static void event_real_notify_relinking (DataSource* base, SourceCollection* sources) { +static void +event_real_notify_relinking (DataSource* base, + SourceCollection* sources) +{ Event * self; - gint _tmp0_; - MediaSource* _tmp1_; - SourceCollection* _tmp7_; + MediaSource* _tmp0_; #line 422 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 422 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_SOURCE_COLLECTION (sources)); #line 423 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); -#line 423 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp0_ > 0, "get_media_count() > 0"); + _vala_assert (event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)) > 0, "get_media_count() > 0"); #line 426 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = self->priv->primary_source; + _tmp0_ = self->priv->primary_source; #line 426 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp1_ == NULL) { -#line 3473 "Event.c" - ViewCollection* _tmp2_; + if (_tmp0_ == NULL) { +#line 3715 "Event.c" + ViewCollection* _tmp1_; + DataView* _tmp2_; DataView* _tmp3_; - DataView* _tmp4_; - DataSource* _tmp5_; - MediaSource* _tmp6_; + DataSource* _tmp4_; + MediaSource* _tmp5_; #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = self->priv->view; + _tmp1_ = self->priv->view; #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = view_collection_get_first_unrejected (_tmp2_); + _tmp2_ = view_collection_get_first_unrejected (_tmp1_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_view_get_source (_tmp4_); + _tmp4_ = data_view_get_source (_tmp3_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - event_set_primary_source (self, _tmp6_); + event_set_primary_source (self, _tmp5_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 427 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp4_); -#line 3495 "Event.c" + _g_object_unref0 (_tmp3_); +#line 3737 "Event.c" } #line 429 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = sources; -#line 429 "/home/jens/Source/shotwell/src/Event.vala" - DATA_SOURCE_CLASS (event_parent_class)->notify_relinking (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), _tmp7_); -#line 3501 "Event.c" + DATA_SOURCE_CLASS (event_parent_class)->notify_relinking (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), sources); +#line 3741 "Event.c" } @@ -3510,253 +3750,237 @@ static void event_real_notify_relinking (DataSource* base, SourceCollection* sou * the thumbnail of this event may need to change, as the primary * image may have been rejected and should not be the thumbnail anymore. */ -static void event_on_media_altered (Event* self, GeeMap* items) { +static void +event_on_media_altered (Event* self, + GeeMap* items) +{ gboolean should_remake_thumb = FALSE; - gboolean _tmp21_; + gboolean _tmp16_; #line 441 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 441 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_MAP (items)); #line 442 "/home/jens/Source/shotwell/src/Event.vala" should_remake_thumb = FALSE; -#line 3523 "Event.c" +#line 3766 "Event.c" { GeeIterator* _alteration_it = NULL; - GeeMap* _tmp0_; + GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; - GeeCollection* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = items; + _tmp0_ = gee_map_get_values (items); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = gee_map_get_values (_tmp0_); + _tmp1_ = _tmp0_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = _tmp1_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_; -#line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_it = _tmp5_; + _alteration_it = _tmp4_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 3550 "Event.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 3790 "Event.c" + GeeIterator* _tmp5_; Alteration* alteration = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - Alteration* _tmp10_; - gboolean _tmp11_; - Alteration* _tmp19_; - gboolean _tmp20_; -#line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _alteration_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + Alteration* _tmp8_; + Alteration* _tmp15_; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _alteration_it; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 444 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3568 "Event.c" +#line 3803 "Event.c" } #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _alteration_it; + _tmp6_ = _alteration_it; #line 444 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 444 "/home/jens/Source/shotwell/src/Event.vala" - alteration = (Alteration*) _tmp9_; -#line 445 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = alteration; + alteration = (Alteration*) _tmp7_; #line 445 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = alteration_has_detail (_tmp10_, "metadata", "exposure-time"); + _tmp8_ = alteration; #line 445 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp11_) { -#line 3582 "Event.c" + if (alteration_has_detail (_tmp8_, "metadata", "exposure-time")) { +#line 3815 "Event.c" gchar* alt_list = NULL; - gchar* _tmp12_; - gboolean _tmp13_; - const gchar* _tmp16_; - Alteration* _tmp17_; - Alteration* _tmp18_; + gchar* _tmp9_; + const gchar* _tmp12_; + Alteration* _tmp13_; + Alteration* _tmp14_; #line 447 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strdup ("metadata:time"); + _tmp9_ = g_strdup ("metadata:time"); #line 447 "/home/jens/Source/shotwell/src/Event.vala" - alt_list = _tmp12_; + alt_list = _tmp9_; #line 449 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = event_has_name (self); -#line 449 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp13_) { -#line 3597 "Event.c" - const gchar* _tmp14_; - gchar* _tmp15_; + if (!event_has_name (self)) { +#line 3827 "Event.c" + const gchar* _tmp10_; + gchar* _tmp11_; #line 450 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = alt_list; + _tmp10_ = alt_list; #line 450 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = g_strconcat (_tmp14_, ", metadata:name", NULL); + _tmp11_ = g_strconcat (_tmp10_, ", metadata:name", NULL); #line 450 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (alt_list); #line 450 "/home/jens/Source/shotwell/src/Event.vala" - alt_list = _tmp15_; -#line 3608 "Event.c" + alt_list = _tmp11_; +#line 3838 "Event.c" } #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = alt_list; + _tmp12_ = alt_list; #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = alteration_new_from_list (_tmp16_); + _tmp13_ = alteration_new_from_list (_tmp12_); #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 452 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_); #line 452 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp18_); + _alteration_unref0 (_tmp14_); #line 454 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (alt_list); #line 454 "/home/jens/Source/shotwell/src/Event.vala" _alteration_unref0 (alteration); #line 454 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 3626 "Event.c" +#line 3856 "Event.c" } #line 457 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = alteration; + _tmp15_ = alteration; #line 457 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = alteration_has_detail (_tmp19_, "metadata", "rating"); -#line 457 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp20_) { + if (alteration_has_detail (_tmp15_, "metadata", "rating")) { #line 458 "/home/jens/Source/shotwell/src/Event.vala" should_remake_thumb = TRUE; -#line 3636 "Event.c" +#line 3864 "Event.c" } #line 444 "/home/jens/Source/shotwell/src/Event.vala" _alteration_unref0 (alteration); -#line 3640 "Event.c" +#line 3868 "Event.c" } #line 444 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_alteration_it); -#line 3644 "Event.c" +#line 3872 "Event.c" } #line 461 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = should_remake_thumb; + _tmp16_ = should_remake_thumb; #line 461 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp21_) { -#line 3650 "Event.c" - gboolean _tmp22_ = FALSE; - MediaSource* _tmp23_; - MediaSource* _tmp24_; - gboolean _tmp25_; + if (_tmp16_) { +#line 3878 "Event.c" + gboolean _tmp17_ = FALSE; + MediaSource* _tmp18_; + MediaSource* _tmp19_; + gboolean _tmp20_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = event_get_primary_source (self); + _tmp18_ = event_get_primary_source (self); #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = _tmp24_ == NULL; + _tmp20_ = _tmp19_ == NULL; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp19_); #line 463 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp25_) { + if (_tmp20_) { #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = TRUE; -#line 3667 "Event.c" + _tmp17_ = TRUE; +#line 3895 "Event.c" } else { - MediaSource* _tmp26_; - MediaSource* _tmp27_; - Rating _tmp28_; + MediaSource* _tmp21_; + MediaSource* _tmp22_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = event_get_primary_source (self); + _tmp21_ = event_get_primary_source (self); #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = media_source_get_rating (_tmp27_); + _tmp17_ = media_source_get_rating (_tmp22_) == RATING_REJECTED; #line 463 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = _tmp28_ == RATING_REJECTED; -#line 463 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp27_); -#line 3682 "Event.c" + _g_object_unref0 (_tmp22_); +#line 3907 "Event.c" } #line 463 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp22_) { -#line 3686 "Event.c" - ViewCollection* _tmp29_; - DataView* _tmp30_; - DataView* _tmp31_; - DataSource* _tmp32_; - MediaSource* _tmp33_; + if (_tmp17_) { +#line 3911 "Event.c" + ViewCollection* _tmp23_; + DataView* _tmp24_; + DataView* _tmp25_; + DataSource* _tmp26_; + MediaSource* _tmp27_; #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = self->priv->view; + _tmp23_ = self->priv->view; #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = view_collection_get_first_unrejected (_tmp29_); + _tmp24_ = view_collection_get_first_unrejected (_tmp23_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = _tmp30_; + _tmp25_ = _tmp24_; #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = data_view_get_source (_tmp31_); + _tmp26_ = data_view_get_source (_tmp25_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - event_set_primary_source (self, _tmp33_); + event_set_primary_source (self, _tmp27_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp27_); #line 465 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp31_); -#line 3708 "Event.c" + _g_object_unref0 (_tmp25_); +#line 3933 "Event.c" } } } -Event* event_create_empty_event (MediaSource* source) { +Event* +event_create_empty_event (MediaSource* source) +{ Event* result = NULL; GError * _inner_error_ = NULL; #line 474 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL); -#line 3719 "Event.c" +#line 3946 "Event.c" { EventRow* _tmp0_ = NULL; EventTable* _tmp1_; EventTable* _tmp2_; - MediaSource* _tmp3_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + EventRow* _tmp5_; EventRow* _tmp6_; - EventRow* _tmp7_; Event* event = NULL; - Event* _tmp8_; - EventSourceCollection* _tmp9_; + Event* _tmp7_; + EventSourceCollection* _tmp8_; + Event* _tmp9_; Event* _tmp10_; - Event* _tmp11_; + gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = event_table_get_instance (); #line 476 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = _tmp1_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = source; + _tmp3_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); + _tmp4_ = _tmp3_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp5_ = event_table_create (_tmp2_, _tmp4_, NULL, &_inner_error_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event_table_create (_tmp2_, _tmp5_, NULL, &_inner_error_); + _tmp6_ = _tmp5_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; -#line 476 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp4_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" _database_table_unref0 (_tmp2_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp7_; + _tmp0_ = _tmp6_; #line 476 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 476 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 3760 "Event.c" +#line 3984 "Event.c" goto __catch444_database_error; } #line 476 "/home/jens/Source/shotwell/src/Event.vala" @@ -3765,56 +3989,56 @@ Event* event_create_empty_event (MediaSource* source) { g_clear_error (&_inner_error_); #line 476 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 3769 "Event.c" +#line 3993 "Event.c" } #line 476 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); + _tmp7_ = event_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID); #line 476 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp8_; + event = _tmp7_; #line 477 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = event_global; + _tmp8_ = event_global; #line 477 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = event; + _tmp9_ = event; #line 477 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = event; + _tmp10_ = event; #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject)); + _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject)); #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 479 "/home/jens/Source/shotwell/src/Event.vala" - g_debug ("Event.vala:479: Created empty event %s", _tmp13_); + g_debug ("Event.vala:479: Created empty event %s", _tmp12_); #line 479 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 481 "/home/jens/Source/shotwell/src/Event.vala" result = event; #line 481 "/home/jens/Source/shotwell/src/Event.vala" _event_row_unref0 (_tmp0_); #line 481 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3797 "Event.c" +#line 4021 "Event.c" } goto __finally444; __catch444_database_error: { GError* err = NULL; - GError* _tmp14_; + GError* _tmp13_; #line 475 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 475 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 483 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = err; + _tmp13_ = err; #line 483 "/home/jens/Source/shotwell/src/Event.vala" - app_window_database_error (_tmp14_); + app_window_database_error (_tmp13_); #line 485 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; #line 485 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); #line 485 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3818 "Event.c" +#line 4042 "Event.c" } __finally444: #line 475 "/home/jens/Source/shotwell/src/Event.vala" @@ -3823,77 +4047,67 @@ Event* event_create_empty_event (MediaSource* source) { g_clear_error (&_inner_error_); #line 475 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 3827 "Event.c" +#line 4051 "Event.c" } -static Event* event_reconstitute (gint64 object_id, EventRow* row) { +static Event* +event_reconstitute (gint64 object_id, + EventRow* row) +{ Event* result = NULL; - EventRow* _tmp0_; + EventTable* _tmp0_; EventTable* _tmp1_; - EventTable* _tmp2_; - EventRow* _tmp3_; - EventID _tmp4_ = {0}; + EventID _tmp2_ = {0}; Event* event = NULL; - EventRow* _tmp5_; - gint64 _tmp6_; - Event* _tmp7_; - EventSourceCollection* _tmp8_; - EventSourceCollection* _tmp9_; - gboolean _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + Event* _tmp3_; + EventSourceCollection* _tmp4_; + EventSourceCollection* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 490 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT_ROW (row), NULL); #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = row; -#line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_table_get_instance (); -#line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp1_; + _tmp0_ = event_table_get_instance (); #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = row; + _tmp1_ = _tmp0_; #line 491 "/home/jens/Source/shotwell/src/Event.vala" - event_table_create_from_row (_tmp2_, _tmp3_, &_tmp4_); + event_table_create_from_row (_tmp1_, row, &_tmp2_); #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_->event_id = _tmp4_; + row->event_id = _tmp2_; #line 491 "/home/jens/Source/shotwell/src/Event.vala" - _database_table_unref0 (_tmp2_); -#line 492 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = row; -#line 492 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = object_id; + _database_table_unref0 (_tmp1_); #line 492 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event_new (_tmp5_, _tmp6_); + _tmp3_ = event_new (row, object_id); #line 492 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp7_; + event = _tmp3_; #line 493 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_global; + _tmp4_ = event_global; #line 493 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); #line 494 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = event_global; -#line 494 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); + _tmp5_ = event_global; #line 494 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp10_, "global.contains(event)"); + _vala_assert (data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)), "global.contains(event)"); #line 496 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); #line 496 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp7_ = _tmp6_; #line 496 "/home/jens/Source/shotwell/src/Event.vala" - g_debug ("Event.vala:496: Reconstituted event %s", _tmp12_); + g_debug ("Event.vala:496: Reconstituted event %s", _tmp7_); #line 496 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp7_); #line 498 "/home/jens/Source/shotwell/src/Event.vala" result = event; #line 498 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3893 "Event.c" +#line 4105 "Event.c" } -static gboolean event_real_has_links (ContainerSource* base) { +static gboolean +event_real_has_links (ContainerSource* base) +{ Event * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -3901,7 +4115,6 @@ static gboolean event_real_has_links (ContainerSource* base) { SourceBacklink* _tmp2_; SourceBacklink* _tmp3_; gboolean _tmp4_; - gboolean _tmp5_; #line 501 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 502 "/home/jens/Source/shotwell/src/Event.vala" @@ -3912,43 +4125,40 @@ static gboolean event_real_has_links (ContainerSource* base) { _tmp3_ = _tmp2_; #line 502 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp3_); -#line 502 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; #line 502 "/home/jens/Source/shotwell/src/Event.vala" _source_backlink_unref0 (_tmp3_); #line 502 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_) { + if (_tmp4_) { #line 502 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = TRUE; -#line 3924 "Event.c" +#line 4135 "Event.c" } else { - VideoSourceCollection* _tmp6_; + VideoSourceCollection* _tmp5_; + SourceBacklink* _tmp6_; SourceBacklink* _tmp7_; - SourceBacklink* _tmp8_; - gboolean _tmp9_; -#line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = video_global; #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); + _tmp5_ = video_global; #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_; + _tmp6_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONTAINER_SOURCE, ContainerSource)); #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp8_); + _tmp7_ = _tmp6_; #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp9_; + _tmp0_ = source_collection_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp7_); #line 503 "/home/jens/Source/shotwell/src/Event.vala" - _source_backlink_unref0 (_tmp8_); -#line 3942 "Event.c" + _source_backlink_unref0 (_tmp7_); +#line 4150 "Event.c" } #line 502 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 502 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3948 "Event.c" +#line 4156 "Event.c" } -static SourceBacklink* event_real_get_backlink (ContainerSource* base) { +static SourceBacklink* +event_real_get_backlink (ContainerSource* base) +{ Event * self; SourceBacklink* result = NULL; SourceBacklink* _tmp0_; @@ -3960,13 +4170,15 @@ static SourceBacklink* event_real_get_backlink (ContainerSource* base) { result = _tmp0_; #line 507 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 3964 "Event.c" +#line 4174 "Event.c" } -static void event_real_break_link (ContainerSource* base, DataSource* source) { +static void +event_real_break_link (ContainerSource* base, + DataSource* source) +{ Event * self; - DataSource* _tmp0_; #line 510 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 510 "/home/jens/Source/shotwell/src/Event.vala" @@ -3974,22 +4186,22 @@ static void event_real_break_link (ContainerSource* base, DataSource* source) { #line 511 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = TRUE; #line 513 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 513 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), NULL); + media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), NULL); #line 515 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = FALSE; -#line 3983 "Event.c" +#line 4193 "Event.c" } -static void event_real_break_link_many (ContainerSource* base, GeeCollection* sources) { +static void +event_real_break_link_many (ContainerSource* base, + GeeCollection* sources) +{ Event * self; GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; GeeArrayList* videos = NULL; GeeArrayList* _tmp1_; - GeeCollection* _tmp2_; GError * _inner_error_ = NULL; #line 518 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); @@ -4006,25 +4218,23 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so #line 522 "/home/jens/Source/shotwell/src/Event.vala" videos = _tmp1_; #line 523 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = sources; -#line 523 "/home/jens/Source/shotwell/src/Event.vala" - media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4013 "Event.c" + media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); +#line 4223 "Event.c" { - LibraryPhotoSourceCollection* _tmp3_; + LibraryPhotoSourceCollection* _tmp2_; + TransactionController* _tmp3_; TransactionController* _tmp4_; - TransactionController* _tmp5_; #line 526 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = library_photo_global; + _tmp2_ = library_photo_global; #line 526 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp3_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 526 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 526 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp5_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp4_, &_inner_error_); #line 526 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4028 "Event.c" +#line 4238 "Event.c" goto __catch445_g_error; } } @@ -4032,29 +4242,29 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so __catch445_g_error: { GError* err = NULL; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 525 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 525 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = err; + _tmp5_ = err; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_->message; + _tmp6_ = _tmp5_->message; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = g_strdup_printf ("%s", _tmp7_); + _tmp7_ = g_strdup_printf ("%s", _tmp6_); #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 528 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp9_, NULL); + app_window_error_message (_tmp8_, NULL); #line 528 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 525 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4058 "Event.c" +#line 4268 "Event.c" } __finally445: #line 525 "/home/jens/Source/shotwell/src/Event.vala" @@ -4069,23 +4279,23 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so g_clear_error (&_inner_error_); #line 525 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4073 "Event.c" +#line 4283 "Event.c" } { - VideoSourceCollection* _tmp10_; + VideoSourceCollection* _tmp9_; + TransactionController* _tmp10_; TransactionController* _tmp11_; - TransactionController* _tmp12_; #line 532 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = video_global; + _tmp9_ = video_global; #line 532 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp10_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 532 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 532 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp12_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), NULL, _tmp11_, &_inner_error_); #line 532 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4089 "Event.c" +#line 4299 "Event.c" goto __catch446_g_error; } } @@ -4093,29 +4303,29 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so __catch446_g_error: { GError* err = NULL; - GError* _tmp13_; - const gchar* _tmp14_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; #line 531 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 531 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = err; + _tmp12_ = err; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_->message; + _tmp13_ = _tmp12_->message; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = g_strdup_printf ("%s", _tmp14_); + _tmp14_ = g_strdup_printf ("%s", _tmp13_); #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 534 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp16_, NULL); + app_window_error_message (_tmp15_, NULL); #line 534 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 531 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4119 "Event.c" +#line 4329 "Event.c" } __finally446: #line 531 "/home/jens/Source/shotwell/src/Event.vala" @@ -4130,7 +4340,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so g_clear_error (&_inner_error_); #line 531 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4134 "Event.c" +#line 4344 "Event.c" } #line 537 "/home/jens/Source/shotwell/src/Event.vala" self->priv->unlinking = FALSE; @@ -4138,13 +4348,15 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so _g_object_unref0 (videos); #line 518 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (photos); -#line 4142 "Event.c" +#line 4352 "Event.c" } -static void event_real_establish_link (ContainerSource* base, DataSource* source) { +static void +event_real_establish_link (ContainerSource* base, + DataSource* source) +{ Event * self; - DataSource* _tmp0_; #line 540 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 540 "/home/jens/Source/shotwell/src/Event.vala" @@ -4152,22 +4364,22 @@ static void event_real_establish_link (ContainerSource* base, DataSource* source #line 541 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = TRUE; #line 543 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; -#line 543 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), self); + media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), self); #line 545 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = FALSE; -#line 4161 "Event.c" +#line 4371 "Event.c" } -static void event_real_establish_link_many (ContainerSource* base, GeeCollection* sources) { +static void +event_real_establish_link_many (ContainerSource* base, + GeeCollection* sources) +{ Event * self; GeeArrayList* photos = NULL; GeeArrayList* _tmp0_; GeeArrayList* videos = NULL; GeeArrayList* _tmp1_; - GeeCollection* _tmp2_; GError * _inner_error_ = NULL; #line 548 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); @@ -4184,25 +4396,23 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection #line 552 "/home/jens/Source/shotwell/src/Event.vala" videos = _tmp1_; #line 553 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = sources; -#line 553 "/home/jens/Source/shotwell/src/Event.vala" - media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); -#line 4191 "Event.c" + media_source_collection_filter_media (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection)); +#line 4401 "Event.c" { - LibraryPhotoSourceCollection* _tmp3_; + LibraryPhotoSourceCollection* _tmp2_; + TransactionController* _tmp3_; TransactionController* _tmp4_; - TransactionController* _tmp5_; #line 556 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = library_photo_global; + _tmp2_ = library_photo_global; #line 556 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp3_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 556 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 556 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp5_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp4_, &_inner_error_); #line 556 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4206 "Event.c" +#line 4416 "Event.c" goto __catch447_g_error; } } @@ -4210,29 +4420,29 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection __catch447_g_error: { GError* err = NULL; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; #line 555 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 555 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = err; + _tmp5_ = err; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_->message; + _tmp6_ = _tmp5_->message; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = g_strdup_printf ("%s", _tmp7_); + _tmp7_ = g_strdup_printf ("%s", _tmp6_); #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 558 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp9_, NULL); + app_window_error_message (_tmp8_, NULL); #line 558 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp8_); #line 555 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4236 "Event.c" +#line 4446 "Event.c" } __finally447: #line 555 "/home/jens/Source/shotwell/src/Event.vala" @@ -4247,23 +4457,23 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection g_clear_error (&_inner_error_); #line 555 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4251 "Event.c" +#line 4461 "Event.c" } { - VideoSourceCollection* _tmp10_; + VideoSourceCollection* _tmp9_; + TransactionController* _tmp10_; TransactionController* _tmp11_; - TransactionController* _tmp12_; #line 562 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = video_global; + _tmp9_ = video_global; #line 562 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); + _tmp10_ = media_source_collection_get_transaction_controller (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 562 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 562 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp12_, &_inner_error_); + media_source_set_many_to_event (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection), self, _tmp11_, &_inner_error_); #line 562 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4267 "Event.c" +#line 4477 "Event.c" goto __catch448_g_error; } } @@ -4271,29 +4481,29 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection __catch448_g_error: { GError* err = NULL; - GError* _tmp13_; - const gchar* _tmp14_; + GError* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; #line 561 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 561 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = err; + _tmp12_ = err; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _tmp13_->message; + _tmp13_ = _tmp12_->message; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = g_strdup_printf ("%s", _tmp14_); + _tmp14_ = g_strdup_printf ("%s", _tmp13_); #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 564 "/home/jens/Source/shotwell/src/Event.vala" - app_window_error_message (_tmp16_, NULL); + app_window_error_message (_tmp15_, NULL); #line 564 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 561 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 4297 "Event.c" +#line 4507 "Event.c" } __finally448: #line 561 "/home/jens/Source/shotwell/src/Event.vala" @@ -4308,7 +4518,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection g_clear_error (&_inner_error_); #line 561 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 4312 "Event.c" +#line 4522 "Event.c" } #line 567 "/home/jens/Source/shotwell/src/Event.vala" self->priv->relinking = FALSE; @@ -4316,421 +4526,335 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection _g_object_unref0 (videos); #line 548 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (photos); -#line 4320 "Event.c" +#line 4530 "Event.c" } -static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { +static gchar* +_vala_g_strjoinv (const gchar* separator, + gchar** str_array, + int str_array_length1) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar** _tmp3_; - gint _tmp3__length1; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = separator; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp0_ == NULL) { -#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp0_ = FALSE; +#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (separator == NULL) { +#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" separator = ""; -#line 4337 "Event.c" - } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = TRUE; -#line 4347 "Event.c" - } else { - gchar** _tmp4_; - gint _tmp4__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = _tmp4__length1 > 0; -#line 4357 "Event.c" +#line 4545 "Event.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = TRUE; -#line 4363 "Event.c" - } else { - gboolean _tmp5_ = FALSE; - gchar** _tmp6_; - gint _tmp6__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp6__length1 == -1) { -#line 4374 "Event.c" - gchar** _tmp7_; - gint _tmp7__length1; - const gchar* _tmp8_; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_[0]; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_ != NULL; -#line 4386 "Event.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array != NULL) { +#line 4549 "Event.c" + gboolean _tmp1_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 > 0) { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 4555 "Event.c" } else { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = FALSE; -#line 4390 "Event.c" + gboolean _tmp2_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 4560 "Event.c" + const gchar* _tmp3_; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = str_array[0]; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp3_ != NULL; +#line 4566 "Event.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = FALSE; +#line 4570 "Event.c" + } +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _tmp2_; +#line 4574 "Event.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = _tmp5_; -#line 4394 "Event.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = _tmp1_; +#line 4578 "Event.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = FALSE; +#line 4582 "Event.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_) { -#line 4398 "Event.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 4586 "Event.c" gint i = 0; gsize len = 0UL; - gint _tmp31_; - gint _tmp33_; - gint _tmp34_; - gsize _tmp35_; - const gchar* _tmp36_; - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; + gint _tmp20_; + gint _tmp22_; + gint _tmp23_; + gsize _tmp24_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; const gchar* res = NULL; - gsize _tmp40_; - void* _tmp41_; + gsize _tmp28_; + void* _tmp29_; void* ptr = NULL; - const gchar* _tmp42_; - gchar** _tmp43_; - gint _tmp43__length1; - const gchar* _tmp44_; - void* _tmp45_; - const gchar* _tmp62_; -#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + const gchar* _tmp30_; + const gchar* _tmp31_; + void* _tmp32_; + const gchar* _tmp45_; +#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 4421 "Event.c" +#line 4606 "Event.c" { - gboolean _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 0; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = TRUE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = TRUE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 4430 "Event.c" - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp21_ = 0; - gchar** _tmp22_; - gint _tmp22__length1; - gint _tmp23_; - const gchar* _tmp24_; - gsize _tmp30_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp9_) { -#line 4443 "Event.c" - gint _tmp10_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp10_ + 1; -#line 4449 "Event.c" +#line 4615 "Event.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gint _tmp12_ = 0; + gint _tmp13_; + const gchar* _tmp14_; + gsize _tmp19_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp4_) { +#line 4624 "Event.c" + gint _tmp5_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp5_ + 1; +#line 4630 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13__length1 != -1) { -#line 4459 "Event.c" - gint _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ < _tmp15__length1; -#line 4471 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 != -1) { +#line 4636 "Event.c" + gint _tmp8_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp8_ < str_array_length1; +#line 4642 "Event.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 4475 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = FALSE; +#line 4646 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp12_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = TRUE; -#line 4481 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp7_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = TRUE; +#line 4652 "Event.c" } else { - gboolean _tmp16_ = FALSE; - gchar** _tmp17_; - gint _tmp17__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp17__length1 == -1) { -#line 4492 "Event.c" - gchar** _tmp18_; - gint _tmp18__length1; - gint _tmp19_; - const gchar* _tmp20_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = _tmp18_[_tmp19_]; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = _tmp20_ != NULL; -#line 4507 "Event.c" + gboolean _tmp9_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 4657 "Event.c" + gint _tmp10_; + const gchar* _tmp11_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp11_ = str_array[_tmp10_]; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = _tmp11_ != NULL; +#line 4666 "Event.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = FALSE; -#line 4511 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = FALSE; +#line 4670 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp16_; -#line 4515 "Event.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp9_; +#line 4674 "Event.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp11_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp6_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 4521 "Event.c" +#line 4680 "Event.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp23_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp24_ = _tmp22_[_tmp23_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp24_ != NULL) { -#line 4533 "Event.c" - gchar** _tmp25_; - gint _tmp25__length1; - gint _tmp26_; - const gchar* _tmp27_; - gint _tmp28_; - gint _tmp29_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp26_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp27_ = _tmp25_[_tmp26_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp29_ = _tmp28_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = _tmp29_; -#line 4554 "Event.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp13_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp14_ = str_array[_tmp13_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp14_ != NULL) { +#line 4688 "Event.c" + gint _tmp15_; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp15_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp16_ = str_array[_tmp15_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp17_ = strlen ((const gchar*) _tmp16_); +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp18_ = _tmp17_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = _tmp18_; +#line 4703 "Event.c" } else { -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = 0; -#line 4558 "Event.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = 0; +#line 4707 "Event.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp30_ = len; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp30_ + _tmp21_; -#line 4564 "Event.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp19_ = len; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp19_ + _tmp12_; +#line 4713 "Event.c" } } -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp31_ = i; -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp31_ == 0) { -#line 4571 "Event.c" - gchar* _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp32_ = g_strdup (""); -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp20_ = i; +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp20_ == 0) { +#line 4720 "Event.c" + gchar* _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp21_ = g_strdup (""); +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4579 "Event.c" +#line 4728 "Event.c" } -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp33_ = i; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - str_array_length1 = _tmp33_; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp34_ = str_array_length1; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp35_ = len; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp36_ = separator; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp38_ = _tmp37_; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp39_ = i; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp40_ = len; -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp41_ = g_malloc (_tmp40_); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - res = _tmp41_; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp42_ = res; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43_ = str_array; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43__length1 = str_array_length1; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp44_ = _tmp43_[0]; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp45_; -#line 4617 "Event.c" +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp22_ = i; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + str_array_length1 = _tmp22_; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp23_ = str_array_length1; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp24_ = len; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp25_ = strlen ((const gchar*) separator); +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp26_ = _tmp25_; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp27_ = i; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1)); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp28_ = len; +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp29_ = g_malloc (_tmp28_); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + res = _tmp29_; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp30_ = res; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp31_ = str_array[0]; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_); +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp32_; +#line 4760 "Event.c" { - gboolean _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = TRUE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = TRUE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 4626 "Event.c" - gint _tmp48_; - gchar** _tmp49_; - gint _tmp49__length1; - void* _tmp50_; - const gchar* _tmp51_; - void* _tmp52_; - const gchar* _tmp53_ = NULL; - gchar** _tmp54_; - gint _tmp54__length1; - gint _tmp55_; - const gchar* _tmp56_; - void* _tmp60_; - void* _tmp61_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp46_) { -#line 4642 "Event.c" - gint _tmp47_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp47_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp47_ + 1; -#line 4648 "Event.c" +#line 4769 "Event.c" + gint _tmp35_; + void* _tmp36_; + void* _tmp37_; + const gchar* _tmp38_ = NULL; + gint _tmp39_; + const gchar* _tmp40_; + void* _tmp43_; + void* _tmp44_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp33_) { +#line 4780 "Event.c" + gint _tmp34_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp34_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp34_ + 1; +#line 4786 "Event.c" } -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp48_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49_ = str_array; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49__length1 = str_array_length1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!(_tmp48_ < _tmp49__length1)) { -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp35_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!(_tmp35_ < str_array_length1)) { +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 4662 "Event.c" +#line 4796 "Event.c" } -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp50_ = ptr; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp51_ = separator; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp52_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp55_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp56_ = _tmp54_[_tmp55_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp56_ != NULL) { -#line 4682 "Event.c" - gchar** _tmp57_; - gint _tmp57__length1; - gint _tmp58_; - const gchar* _tmp59_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp58_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp59_ = _tmp57_[_tmp58_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = (const gchar*) _tmp59_; -#line 4697 "Event.c" +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp36_ = ptr; +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator); +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp37_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp39_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp40_ = str_array[_tmp39_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp40_ != NULL) { +#line 4810 "Event.c" + gint _tmp41_; + const gchar* _tmp42_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp41_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp42_ = str_array[_tmp41_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = (const gchar*) _tmp42_; +#line 4819 "Event.c" } else { -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = ""; -#line 4701 "Event.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = ""; +#line 4823 "Event.c" } -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp60_ = ptr; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp61_; -#line 4709 "Event.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp43_ = ptr; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp44_ = g_stpcpy (_tmp43_, _tmp38_); +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp44_; +#line 4831 "Event.c" } } -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp62_ = res; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp45_ = res; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = NULL; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gchar*) _tmp62_; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gchar*) _tmp45_; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4720 "Event.c" +#line 4842 "Event.c" } else { - gchar* _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp63_ = g_strdup (""); -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp46_ = g_strdup (""); +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 4729 "Event.c" +#line 4851 "Event.c" } } -static void event_update_indexable_keywords (Event* self) { +static void +event_update_indexable_keywords (Event* self) +{ gchar** components = NULL; gchar** _tmp0_; gint components_length1; @@ -4763,7 +4887,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp2_ = rawname; #line 575 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp2_ != NULL) { -#line 4767 "Event.c" +#line 4891 "Event.c" gchar** _tmp3_; gint _tmp3__length1; gint _tmp4_; @@ -4788,7 +4912,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp3_[_tmp4_] = _tmp6_; #line 576 "/home/jens/Source/shotwell/src/Event.vala" _tmp7_ = _tmp3_[_tmp4_]; -#line 4792 "Event.c" +#line 4916 "Event.c" } #line 578 "/home/jens/Source/shotwell/src/Event.vala" _tmp8_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); @@ -4798,7 +4922,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp9_ = comment; #line 579 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp9_ != NULL) { -#line 4802 "Event.c" +#line 4926 "Event.c" gchar** _tmp10_; gint _tmp10__length1; gint _tmp11_; @@ -4823,7 +4947,7 @@ static void event_update_indexable_keywords (Event* self) { _tmp10_[_tmp11_] = _tmp13_; #line 580 "/home/jens/Source/shotwell/src/Event.vala" _tmp14_ = _tmp10_[_tmp11_]; -#line 4827 "Event.c" +#line 4951 "Event.c" } #line 582 "/home/jens/Source/shotwell/src/Event.vala" _tmp15_ = i; @@ -4833,7 +4957,7 @@ static void event_update_indexable_keywords (Event* self) { _g_free0 (self->priv->indexable_keywords); #line 583 "/home/jens/Source/shotwell/src/Event.vala" self->priv->indexable_keywords = NULL; -#line 4837 "Event.c" +#line 4961 "Event.c" } else { gchar** _tmp16_; gint _tmp16__length1; @@ -4872,7 +4996,7 @@ static void event_update_indexable_keywords (Event* self) { self->priv->indexable_keywords = _tmp22_; #line 586 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (_tmp21_); -#line 4876 "Event.c" +#line 5000 "Event.c" } #line 570 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (comment); @@ -4880,11 +5004,13 @@ static void event_update_indexable_keywords (Event* self) { _g_free0 (rawname); #line 570 "/home/jens/Source/shotwell/src/Event.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); -#line 4884 "Event.c" +#line 5008 "Event.c" } -static const gchar* event_real_get_indexable_keywords (Indexable* base) { +static const gchar* +event_real_get_indexable_keywords (Indexable* base) +{ Event * self; const gchar* result = NULL; const gchar* _tmp0_; @@ -4896,91 +5022,89 @@ static const gchar* event_real_get_indexable_keywords (Indexable* base) { result = _tmp0_; #line 591 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 4900 "Event.c" +#line 5026 "Event.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 4915 "Event.c" +#line 5044 "Event.c" } -gboolean event_is_in_starting_day (Event* self, time_t time) { +gboolean +event_is_in_starting_day (Event* self, + time_t time) +{ gboolean result = FALSE; ViewCollection* _tmp0_; - gint _tmp1_; MediaSource* earliest_media = NULL; - ViewCollection* _tmp2_; - DataObject* _tmp3_; - DataView* _tmp4_; - DataSource* _tmp5_; - MediaSource* _tmp6_; + ViewCollection* _tmp1_; + DataObject* _tmp2_; + DataView* _tmp3_; + DataSource* _tmp4_; + MediaSource* _tmp5_; struct tm earliest_tm = {0}; - MediaSource* _tmp7_; - time_t _tmp8_; - struct tm _tmp9_ = {0}; + MediaSource* _tmp6_; + struct tm _tmp7_ = {0}; struct tm start_boundary_tm = {0}; + struct tm _tmp8_; + gint _tmp9_; struct tm _tmp10_; gint _tmp11_; struct tm _tmp12_; gint _tmp13_; + time_t start_boundary = 0; struct tm _tmp14_; gint _tmp15_; - time_t start_boundary = 0; - time_t _tmp16_; - struct tm _tmp17_; - gint _tmp18_; time_t end_boundary = 0; - time_t _tmp20_; - gboolean _tmp21_ = FALSE; - time_t _tmp22_; - time_t _tmp23_; + time_t _tmp17_; + gboolean _tmp18_ = FALSE; + time_t _tmp19_; #line 594 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 599 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 599 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 599 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp1_ == 0) { + if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)) == 0) { #line 600 "/home/jens/Source/shotwell/src/Event.vala" result = FALSE; #line 600 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 4961 "Event.c" +#line 5087 "Event.c" } #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = self->priv->view; + _tmp1_ = self->priv->view; #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), 0); + _tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), 0); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_view_get_source (_tmp4_); + _tmp4_ = data_view_get_source (_tmp3_); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 603 "/home/jens/Source/shotwell/src/Event.vala" - earliest_media = _tmp6_; -#line 604 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = earliest_media; + earliest_media = _tmp5_; #line 604 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media_source_get_exposure_time (_tmp7_); + _tmp6_ = earliest_media; #line 604 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp8_, &_tmp9_); + g_time_local (media_source_get_exposure_time (_tmp6_), &_tmp7_); #line 604 "/home/jens/Source/shotwell/src/Event.vala" - earliest_tm = _tmp9_; + earliest_tm = _tmp7_; #line 607 "/home/jens/Source/shotwell/src/Event.vala" memset (&start_boundary_tm, 0, sizeof (struct tm)); #line 608 "/home/jens/Source/shotwell/src/Event.vala" @@ -4990,135 +5114,118 @@ gboolean event_is_in_starting_day (Event* self, time_t time) { #line 610 "/home/jens/Source/shotwell/src/Event.vala" start_boundary_tm.tm_hour = EVENT_EVENT_BOUNDARY_HOUR; #line 611 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = earliest_tm; + _tmp8_ = earliest_tm; #line 611 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_.tm_mday; + _tmp9_ = _tmp8_.tm_mday; #line 611 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary_tm.tm_mday = _tmp11_; + start_boundary_tm.tm_mday = _tmp9_; #line 612 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = earliest_tm; + _tmp10_ = earliest_tm; #line 612 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _tmp12_.tm_mon; + _tmp11_ = _tmp10_.tm_mon; #line 612 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary_tm.tm_mon = _tmp13_; + start_boundary_tm.tm_mon = _tmp11_; #line 613 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = earliest_tm; + _tmp12_ = earliest_tm; #line 613 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _tmp14_.tm_year; + _tmp13_ = _tmp12_.tm_year; #line 613 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary_tm.tm_year = _tmp15_; + start_boundary_tm.tm_year = _tmp13_; #line 614 "/home/jens/Source/shotwell/src/Event.vala" start_boundary_tm.tm_isdst = -1; #line 616 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = mktime (&start_boundary_tm); -#line 616 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary = _tmp16_; + start_boundary = mktime (&start_boundary_tm); #line 620 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = earliest_tm; + _tmp14_ = earliest_tm; #line 620 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_.tm_hour; + _tmp15_ = _tmp14_.tm_hour; #line 620 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp18_ < EVENT_EVENT_BOUNDARY_HOUR) { -#line 5023 "Event.c" - time_t _tmp19_; + if (_tmp15_ < EVENT_EVENT_BOUNDARY_HOUR) { +#line 5145 "Event.c" + time_t _tmp16_; #line 621 "/home/jens/Source/shotwell/src/Event.vala" g_debug ("Event.vala:621: Hour before boundary, shifting back one day"); #line 622 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = start_boundary; + _tmp16_ = start_boundary; #line 622 "/home/jens/Source/shotwell/src/Event.vala" - start_boundary = _tmp19_ - EVENT_TIME_T_DAY; -#line 5031 "Event.c" + start_boundary = _tmp16_ - EVENT_TIME_T_DAY; +#line 5153 "Event.c" } #line 625 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = start_boundary; + _tmp17_ = start_boundary; #line 625 "/home/jens/Source/shotwell/src/Event.vala" - end_boundary = (_tmp20_ + EVENT_TIME_T_DAY) - 1; -#line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = time; -#line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = start_boundary; + end_boundary = (_tmp17_ + EVENT_TIME_T_DAY) - 1; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp22_ >= _tmp23_) { -#line 5043 "Event.c" - time_t _tmp24_; - time_t _tmp25_; + _tmp19_ = start_boundary; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = time; + if (time >= _tmp19_) { +#line 5163 "Event.c" + time_t _tmp20_; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = end_boundary; + _tmp20_ = end_boundary; #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = _tmp24_ <= _tmp25_; -#line 5052 "Event.c" + _tmp18_ = time <= _tmp20_; +#line 5169 "Event.c" } else { #line 627 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = FALSE; -#line 5056 "Event.c" + _tmp18_ = FALSE; +#line 5173 "Event.c" } #line 627 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp21_; + result = _tmp18_; #line 627 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (earliest_media); #line 627 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5064 "Event.c" +#line 5181 "Event.c" } -static Event* event_generate_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name, gboolean* new_event) { +static Event* +event_generate_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name, + gboolean* new_event) +{ gboolean _vala_new_event = FALSE; Event* result = NULL; time_t exposure_time = 0; - MediaSource* _tmp0_; + gboolean _tmp0_ = FALSE; time_t _tmp1_; - gboolean _tmp2_ = FALSE; - time_t _tmp3_; gint count = 0; - ViewCollection* _tmp8_; - gint _tmp9_; GError * _inner_error_ = NULL; #line 633 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL); #line 633 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_VIEW_COLLECTION (events_so_far), NULL); #line 635 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = media; -#line 635 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_get_exposure_time (_tmp0_); -#line 635 "/home/jens/Source/shotwell/src/Event.vala" - exposure_time = _tmp1_; + exposure_time = media_source_get_exposure_time (media); #line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = exposure_time; + _tmp1_ = exposure_time; #line 637 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ == ((time_t) 0)) { -#line 5094 "Event.c" - const gchar* _tmp4_; -#line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_name; + if (_tmp1_ == ((time_t) 0)) { #line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp4_ == NULL; -#line 5100 "Event.c" + _tmp0_ = event_name == NULL; +#line 5210 "Event.c" } else { #line 637 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; -#line 5104 "Event.c" + _tmp0_ = FALSE; +#line 5214 "Event.c" } #line 637 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_) { -#line 5108 "Event.c" - MediaSource* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; -#line 638 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = media; + if (_tmp0_) { +#line 5218 "Event.c" + gchar* _tmp2_; + gchar* _tmp3_; #line 638 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_OBJECT, DataObject)); #line 638 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 638 "/home/jens/Source/shotwell/src/Event.vala" g_debug ("Event.vala:638: Skipping event assignment to %s: no exposure time and " \ -"no event name", _tmp7_); +"no event name", _tmp3_); #line 638 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp3_); #line 639 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = FALSE; #line 641 "/home/jens/Source/shotwell/src/Event.vala" @@ -5127,147 +5234,128 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s if (new_event) { #line 641 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5130 "Event.c" +#line 5237 "Event.c" } #line 641 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5134 "Event.c" +#line 5241 "Event.c" } #line 644 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = events_so_far; -#line 644 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); -#line 644 "/home/jens/Source/shotwell/src/Event.vala" - count = _tmp9_; -#line 5142 "Event.c" + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (events_so_far, TYPE_DATA_COLLECTION, DataCollection)); +#line 5245 "Event.c" { gint ctr = 0; #line 645 "/home/jens/Source/shotwell/src/Event.vala" ctr = 0; -#line 5147 "Event.c" +#line 5250 "Event.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp4_ = FALSE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = TRUE; + _tmp4_ = TRUE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 5154 "Event.c" - gint _tmp12_; - gint _tmp13_; +#line 5257 "Event.c" + gint _tmp6_; + gint _tmp7_; Event* event = NULL; - ViewCollection* _tmp14_; - gint _tmp15_; - DataObject* _tmp16_; - EventView* _tmp17_; - DataSource* _tmp18_; - Event* _tmp19_; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - const gchar* _tmp23_; + gint _tmp8_; + DataObject* _tmp9_; + EventView* _tmp10_; + DataSource* _tmp11_; + Event* _tmp12_; + gboolean _tmp13_ = FALSE; + gboolean _tmp14_ = FALSE; + gboolean _tmp15_ = FALSE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp10_) { -#line 5170 "Event.c" - gint _tmp11_; + if (!_tmp4_) { +#line 5271 "Event.c" + gint _tmp5_; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = ctr; + _tmp5_ = ctr; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - ctr = _tmp11_ + 1; -#line 5176 "Event.c" + ctr = _tmp5_ + 1; +#line 5277 "Event.c" } #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = FALSE; + _tmp4_ = FALSE; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = ctr; + _tmp6_ = ctr; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = count; + _tmp7_ = count; #line 645 "/home/jens/Source/shotwell/src/Event.vala" - if (!(_tmp12_ < _tmp13_)) { + if (!(_tmp6_ < _tmp7_)) { #line 645 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 5188 "Event.c" +#line 5289 "Event.c" } #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = events_so_far; + _tmp8_ = ctr; #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = ctr; + _tmp9_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (events_so_far, TYPE_DATA_COLLECTION, DataCollection), _tmp8_); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), _tmp15_); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_VIEW, EventView); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_VIEW, EventView); + _tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView)); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView)); + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT, Event); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_EVENT, Event); + _g_object_unref0 (_tmp10_); #line 646 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp17_); -#line 646 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp19_; + event = _tmp12_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = event_name; -#line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp23_ != NULL) { -#line 5210 "Event.c" - Event* _tmp24_; - gboolean _tmp25_; -#line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = event; + if (event_name != NULL) { +#line 5307 "Event.c" + Event* _tmp16_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = event_has_name (_tmp24_); + _tmp16_ = event; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = _tmp25_; -#line 5219 "Event.c" + _tmp15_ = event_has_name (_tmp16_); +#line 5313 "Event.c" } else { #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = FALSE; -#line 5223 "Event.c" + _tmp15_ = FALSE; +#line 5317 "Event.c" } #line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp22_) { -#line 5227 "Event.c" - const gchar* _tmp26_; - Event* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; + if (_tmp15_) { +#line 5321 "Event.c" + Event* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = event_name; + _tmp17_ = event; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = event; + _tmp18_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject)); + _tmp19_ = _tmp18_; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = _tmp28_; + _tmp14_ = g_strcmp0 (event_name, _tmp19_) == 0; #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = g_strcmp0 (_tmp26_, _tmp29_) == 0; -#line 648 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp29_); -#line 5244 "Event.c" + _g_free0 (_tmp19_); +#line 5335 "Event.c" } else { #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = FALSE; -#line 5248 "Event.c" + _tmp14_ = FALSE; +#line 5339 "Event.c" } #line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp21_) { + if (_tmp14_) { #line 648 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = TRUE; -#line 5254 "Event.c" + _tmp13_ = TRUE; +#line 5345 "Event.c" } else { - Event* _tmp30_; - time_t _tmp31_; - gboolean _tmp32_; -#line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp30_ = event; + Event* _tmp20_; + time_t _tmp21_; #line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = exposure_time; + _tmp20_ = event; #line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = event_is_in_starting_day (_tmp30_, _tmp31_); + _tmp21_ = exposure_time; #line 649 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = _tmp32_; -#line 5267 "Event.c" + _tmp13_ = event_is_in_starting_day (_tmp20_, _tmp21_); +#line 5355 "Event.c" } #line 648 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp20_) { + if (_tmp13_) { #line 650 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = FALSE; #line 652 "/home/jens/Source/shotwell/src/Event.vala" @@ -5276,59 +5364,54 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s if (new_event) { #line 652 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5279 "Event.c" +#line 5367 "Event.c" } #line 652 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5283 "Event.c" +#line 5371 "Event.c" } #line 645 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); -#line 5287 "Event.c" +#line 5375 "Event.c" } } } { - EventRow* _tmp33_ = NULL; - EventTable* _tmp34_; - EventTable* _tmp35_; - MediaSource* _tmp36_; - gchar* _tmp37_; - gchar* _tmp38_; - EventRow* _tmp39_; - EventRow* _tmp40_; + EventRow* _tmp22_ = NULL; + EventTable* _tmp23_; + EventTable* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + EventRow* _tmp27_; + EventRow* _tmp28_; Event* event = NULL; - Event* _tmp41_; - const gchar* _tmp42_; - ViewCollection* _tmp45_; - Event* _tmp46_; - EventView* _tmp47_; - EventView* _tmp48_; -#line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = event_table_get_instance (); + Event* _tmp29_; + Event* _tmp31_; + EventView* _tmp32_; + EventView* _tmp33_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp35_ = _tmp34_; + _tmp23_ = event_table_get_instance (); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp36_ = media; + _tmp24_ = _tmp23_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp37_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_SOURCE, DataSource)); + _tmp25_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_DATA_SOURCE, DataSource)); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp38_ = _tmp37_; + _tmp26_ = _tmp25_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp39_ = event_table_create (_tmp35_, _tmp38_, NULL, &_inner_error_); + _tmp27_ = event_table_create (_tmp24_, _tmp26_, NULL, &_inner_error_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp40_ = _tmp39_; + _tmp28_ = _tmp27_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp26_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _database_table_unref0 (_tmp35_); + _database_table_unref0 (_tmp24_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = _tmp40_; + _tmp22_ = _tmp28_; #line 658 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 658 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 5331 "Event.c" +#line 5414 "Event.c" goto __catch449_database_error; } #line 658 "/home/jens/Source/shotwell/src/Event.vala" @@ -5337,71 +5420,64 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s g_clear_error (&_inner_error_); #line 658 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 5340 "Event.c" +#line 5423 "Event.c" } #line 658 "/home/jens/Source/shotwell/src/Event.vala" - _tmp41_ = event_new (_tmp33_, DATA_OBJECT_INVALID_OBJECT_ID); + _tmp29_ = event_new (_tmp22_, DATA_OBJECT_INVALID_OBJECT_ID); #line 658 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp41_; -#line 659 "/home/jens/Source/shotwell/src/Event.vala" - _tmp42_ = event_name; + event = _tmp29_; #line 659 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp42_ != NULL) { -#line 5350 "Event.c" - Event* _tmp43_; - const gchar* _tmp44_; + if (event_name != NULL) { +#line 5431 "Event.c" + Event* _tmp30_; #line 660 "/home/jens/Source/shotwell/src/Event.vala" - _tmp43_ = event; + _tmp30_ = event; #line 660 "/home/jens/Source/shotwell/src/Event.vala" - _tmp44_ = event_name; -#line 660 "/home/jens/Source/shotwell/src/Event.vala" - event_rename (_tmp43_, _tmp44_); -#line 5359 "Event.c" + event_rename (_tmp30_, event_name); +#line 5437 "Event.c" } #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp45_ = events_so_far; -#line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp46_ = event; + _tmp31_ = event; #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp47_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_EVENT_SOURCE, EventSource)); + _tmp32_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_EVENT_SOURCE, EventSource)); #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _tmp48_ = _tmp47_; + _tmp33_ = _tmp32_; #line 662 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (events_so_far, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_OBJECT, DataObject)); #line 662 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp48_); + _g_object_unref0 (_tmp33_); #line 664 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = TRUE; #line 665 "/home/jens/Source/shotwell/src/Event.vala" result = event; #line 665 "/home/jens/Source/shotwell/src/Event.vala" - _event_row_unref0 (_tmp33_); + _event_row_unref0 (_tmp22_); #line 665 "/home/jens/Source/shotwell/src/Event.vala" if (new_event) { #line 665 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5383 "Event.c" +#line 5459 "Event.c" } #line 665 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5387 "Event.c" +#line 5463 "Event.c" } goto __finally449; __catch449_database_error: { GError* err = NULL; - GError* _tmp49_; + GError* _tmp34_; #line 657 "/home/jens/Source/shotwell/src/Event.vala" err = _inner_error_; #line 657 "/home/jens/Source/shotwell/src/Event.vala" _inner_error_ = NULL; #line 667 "/home/jens/Source/shotwell/src/Event.vala" - _tmp49_ = err; + _tmp34_ = err; #line 667 "/home/jens/Source/shotwell/src/Event.vala" - app_window_database_error (_tmp49_); + app_window_database_error (_tmp34_); #line 657 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 5404 "Event.c" +#line 5480 "Event.c" } __finally449: #line 657 "/home/jens/Source/shotwell/src/Event.vala" @@ -5412,7 +5488,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s g_clear_error (&_inner_error_); #line 657 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 5415 "Event.c" +#line 5491 "Event.c" } #line 670 "/home/jens/Source/shotwell/src/Event.vala" _vala_new_event = FALSE; @@ -5422,105 +5498,97 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s if (new_event) { #line 672 "/home/jens/Source/shotwell/src/Event.vala" *new_event = _vala_new_event; -#line 5425 "Event.c" +#line 5501 "Event.c" } #line 672 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5429 "Event.c" +#line 5505 "Event.c" } -void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name) { - MediaSource* _tmp0_; +void +event_generate_single_event (MediaSource* media, + ViewCollection* events_so_far, + const gchar* event_name) +{ + Event* _tmp0_; Event* _tmp1_; - Event* _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; gboolean new_event = FALSE; Event* event = NULL; - MediaSource* _tmp4_; - ViewCollection* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_ = FALSE; - Event* _tmp8_; - Event* _tmp9_; - MediaSource* _tmp10_; - Event* _tmp11_; - gboolean _tmp12_; + gboolean _tmp3_ = FALSE; + Event* _tmp4_; + Event* _tmp5_; + Event* _tmp6_; + gboolean _tmp7_; #line 675 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_MEDIA_SOURCE (media)); #line 675 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_VIEW_COLLECTION (events_so_far)); #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = media; -#line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_get_event (_tmp0_); + _tmp0_ = media_source_get_event (media); #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp2_ != NULL; + _tmp2_ = _tmp1_ != NULL; #line 678 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 678 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_) { + if (_tmp2_) { #line 679 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 5467 "Event.c" +#line 5540 "Event.c" } #line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = media; -#line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = events_so_far; -#line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event_name; + _tmp4_ = event_generate_event (media, events_so_far, event_name, &_tmp3_); #line 682 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_generate_event (_tmp4_, _tmp5_, _tmp6_, &_tmp7_); + new_event = _tmp3_; #line 682 "/home/jens/Source/shotwell/src/Event.vala" - new_event = _tmp7_; -#line 682 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp8_; + event = _tmp4_; #line 683 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = event; + _tmp5_ = event; #line 683 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp9_ == NULL) { + if (_tmp5_ == NULL) { #line 684 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 684 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 5489 "Event.c" +#line 5556 "Event.c" } #line 686 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = media; + _tmp6_ = event; #line 686 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = event; -#line 686 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (_tmp10_, _tmp11_); + media_source_set_event (media, _tmp6_); #line 688 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = new_event; + _tmp7_ = new_event; #line 688 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp12_) { -#line 5501 "Event.c" - EventSourceCollection* _tmp13_; - Event* _tmp14_; + if (_tmp7_) { +#line 5566 "Event.c" + EventSourceCollection* _tmp8_; + Event* _tmp9_; #line 689 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = event_global; + _tmp8_ = event_global; #line 689 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = event; + _tmp9_ = event; #line 689 "/home/jens/Source/shotwell/src/Event.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); -#line 5510 "Event.c" + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); +#line 5575 "Event.c" } #line 675 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); -#line 5514 "Event.c" +#line 5579 "Event.c" } -void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far) { +void +event_generate_many_events (GeeCollection* sources, + ViewCollection* events_so_far) +{ GeeCollection* to_add = NULL; GeeArrayList* _tmp0_; - GeeCollection* _tmp21_; - gint _tmp22_; - gint _tmp23_; + GeeCollection* _tmp18_; + gint _tmp19_; + gint _tmp20_; #line 692 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (GEE_IS_COLLECTION (sources)); #line 692 "/home/jens/Source/shotwell/src/Event.vala" @@ -5529,158 +5597,152 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_ _tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 693 "/home/jens/Source/shotwell/src/Event.vala" to_add = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); -#line 5532 "Event.c" +#line 5600 "Event.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; + GeeIterator* _tmp1_; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = sources; -#line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (sources, GEE_TYPE_ITERABLE, GeeIterable)); #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _media_it = _tmp2_; + _media_it = _tmp1_; #line 694 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 5545 "Event.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 5610 "Event.c" + GeeIterator* _tmp2_; MediaSource* media = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - MediaSource* _tmp7_; - Event* _tmp8_; - Event* _tmp9_; - gboolean _tmp10_; + GeeIterator* _tmp3_; + gpointer _tmp4_; + MediaSource* _tmp5_; + Event* _tmp6_; + Event* _tmp7_; + gboolean _tmp8_; gboolean new_event = FALSE; Event* event = NULL; - MediaSource* _tmp11_; - ViewCollection* _tmp12_; - gboolean _tmp13_ = FALSE; + MediaSource* _tmp9_; + gboolean _tmp10_ = FALSE; + Event* _tmp11_; + Event* _tmp12_; + MediaSource* _tmp13_; Event* _tmp14_; - Event* _tmp15_; - MediaSource* _tmp16_; - Event* _tmp17_; - gboolean _tmp18_; -#line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _media_it; + gboolean _tmp15_; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _media_it; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 694 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 5573 "Event.c" +#line 5634 "Event.c" } #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _media_it; + _tmp3_ = _media_it; #line 694 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 694 "/home/jens/Source/shotwell/src/Event.vala" - media = (MediaSource*) _tmp6_; + media = (MediaSource*) _tmp4_; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = media; + _tmp5_ = media; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media_source_get_event (_tmp7_); + _tmp6_ = media_source_get_event (_tmp5_); #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_ != NULL; + _tmp8_ = _tmp7_ != NULL; #line 696 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp7_); #line 696 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp10_) { + if (_tmp8_) { #line 697 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 697 "/home/jens/Source/shotwell/src/Event.vala" continue; -#line 5597 "Event.c" +#line 5658 "Event.c" } #line 700 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = media; + _tmp9_ = media; #line 700 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = events_so_far; + _tmp11_ = event_generate_event (_tmp9_, events_so_far, NULL, &_tmp10_); #line 700 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = event_generate_event (_tmp11_, _tmp12_, NULL, &_tmp13_); + new_event = _tmp10_; #line 700 "/home/jens/Source/shotwell/src/Event.vala" - new_event = _tmp13_; -#line 700 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp14_; + event = _tmp11_; #line 701 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = event; + _tmp12_ = event; #line 701 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp15_ == NULL) { + if (_tmp12_ == NULL) { #line 702 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 702 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); #line 702 "/home/jens/Source/shotwell/src/Event.vala" continue; -#line 5619 "Event.c" +#line 5678 "Event.c" } #line 704 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = media; + _tmp13_ = media; #line 704 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = event; + _tmp14_ = event; #line 704 "/home/jens/Source/shotwell/src/Event.vala" - media_source_set_event (_tmp16_, _tmp17_); + media_source_set_event (_tmp13_, _tmp14_); #line 706 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = new_event; + _tmp15_ = new_event; #line 706 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp18_) { -#line 5631 "Event.c" - GeeCollection* _tmp19_; - Event* _tmp20_; + if (_tmp15_) { +#line 5690 "Event.c" + GeeCollection* _tmp16_; + Event* _tmp17_; #line 707 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = to_add; + _tmp16_ = to_add; #line 707 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = event; + _tmp17_ = event; #line 707 "/home/jens/Source/shotwell/src/Event.vala" - gee_collection_add (_tmp19_, _tmp20_); -#line 5640 "Event.c" + gee_collection_add (_tmp16_, _tmp17_); +#line 5699 "Event.c" } #line 694 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 694 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media); -#line 5646 "Event.c" +#line 5705 "Event.c" } #line 694 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_media_it); -#line 5650 "Event.c" +#line 5709 "Event.c" } #line 710 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = to_add; + _tmp18_ = to_add; #line 710 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = gee_collection_get_size (_tmp21_); + _tmp19_ = gee_collection_get_size (_tmp18_); #line 710 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = _tmp22_; + _tmp20_ = _tmp19_; #line 710 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp23_ > 0) { -#line 5660 "Event.c" - EventSourceCollection* _tmp24_; - GeeCollection* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + if (_tmp20_ > 0) { +#line 5719 "Event.c" + EventSourceCollection* _tmp21_; + GeeCollection* _tmp22_; + GeeCollection* _tmp23_; + GeeCollection* _tmp24_; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = event_global; + _tmp21_ = event_global; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = to_add; + _tmp22_ = to_add; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_, NULL, NULL); + _tmp23_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), _tmp22_, NULL, NULL); #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = _tmp26_; + _tmp24_ = _tmp23_; #line 711 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp27_); -#line 5675 "Event.c" + _g_object_unref0 (_tmp24_); +#line 5734 "Event.c" } #line 692 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (to_add); -#line 5679 "Event.c" +#line 5738 "Event.c" } -void event_get_event_id (Event* self, EventID* result) { +void +event_get_event_id (Event* self, + EventID* result) +{ EventID _tmp0_; #line 714 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); @@ -5690,11 +5752,13 @@ void event_get_event_id (Event* self, EventID* result) { *result = _tmp0_; #line 715 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 5693 "Event.c" +#line 5755 "Event.c" } -static SourceSnapshot* event_real_save_snapshot (DataSource* base) { +static SourceSnapshot* +event_real_save_snapshot (DataSource* base) +{ Event * self; SourceSnapshot* result = NULL; EventEventSnapshot* _tmp0_; @@ -5706,11 +5770,13 @@ static SourceSnapshot* event_real_save_snapshot (DataSource* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_SNAPSHOT, SourceSnapshot); #line 719 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5709 "Event.c" +#line 5773 "Event.c" } -static SourceProxy* event_real_get_proxy (Proxyable* base) { +static SourceProxy* +event_real_get_proxy (Proxyable* base) +{ Event * self; SourceProxy* result = NULL; EventEventProxy* _tmp0_; @@ -5722,88 +5788,83 @@ static SourceProxy* event_real_get_proxy (Proxyable* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_PROXY, SourceProxy); #line 723 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5725 "Event.c" +#line 5791 "Event.c" } -static gboolean event_real_equals (DataSource* base, DataSource* source) { +static gboolean +event_real_equals (DataSource* base, + DataSource* source) +{ Event * self; gboolean result = FALSE; Event* event = NULL; - DataSource* _tmp0_; + Event* _tmp0_; Event* _tmp1_; - Event* _tmp2_; - DataSource* _tmp9_; - gboolean _tmp10_; #line 726 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 726 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE); #line 728 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_EVENT) ? ((Event*) source) : NULL); #line 728 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT) ? ((Event*) _tmp0_) : NULL); -#line 728 "/home/jens/Source/shotwell/src/Event.vala" - event = _tmp1_; + event = _tmp0_; #line 729 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event; + _tmp1_ = event; #line 729 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_ != NULL) { -#line 5752 "Event.c" - Event* _tmp3_; + if (_tmp1_ != NULL) { +#line 5816 "Event.c" + Event* _tmp2_; #line 730 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event; + _tmp2_ = event; #line 730 "/home/jens/Source/shotwell/src/Event.vala" - if (self != _tmp3_) { -#line 5758 "Event.c" - EventID _tmp4_; - gint64 _tmp5_; - Event* _tmp6_; - EventID _tmp7_; - gint64 _tmp8_; + if (self != _tmp2_) { +#line 5822 "Event.c" + EventID _tmp3_; + gint64 _tmp4_; + Event* _tmp5_; + EventID _tmp6_; + gint64 _tmp7_; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->event_id; + _tmp3_ = self->priv->event_id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp4_.id; + _tmp4_ = _tmp3_.id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event; + _tmp5_ = event; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_->priv->event_id; + _tmp6_ = _tmp5_->priv->event_id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_.id; + _tmp7_ = _tmp6_.id; #line 731 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp5_ != _tmp8_, "event_id.id != event.event_id.id"); -#line 5776 "Event.c" + _vala_assert (_tmp4_ != _tmp7_, "event_id.id != event.event_id.id"); +#line 5840 "Event.c" } } #line 735 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = source; -#line 735 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = DATA_SOURCE_CLASS (event_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), _tmp9_); -#line 735 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = DATA_SOURCE_CLASS (event_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), source); #line 735 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (event); #line 735 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5789 "Event.c" +#line 5849 "Event.c" } -static gchar* event_real_to_string (DataObject* base) { +static gchar* +event_real_to_string (DataObject* base) +{ Event * self; gchar* result = NULL; EventID _tmp0_; gint64 _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - gint64 _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; #line 738 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 739 "/home/jens/Source/shotwell/src/Event.vala" @@ -5815,34 +5876,34 @@ static gchar* event_real_to_string (DataObject* base) { #line 739 "/home/jens/Source/shotwell/src/Event.vala" _tmp3_ = _tmp2_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject))); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp4_); -#line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); + _tmp6_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject)); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = g_strdup_printf ("Event [%s/%s] %s", _tmp3_, _tmp6_, _tmp8_); + _tmp8_ = g_strdup_printf ("Event [%s/%s] %s", _tmp3_, _tmp5_, _tmp7_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (_tmp3_); #line 739 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = _tmp9_; #line 739 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5841 "Event.c" +#line 5900 "Event.c" } -gboolean event_has_name (Event* self) { +gboolean +event_has_name (Event* self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_; @@ -5852,7 +5913,7 @@ gboolean event_has_name (Event* self) { _tmp1_ = self->priv->raw_name; #line 743 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 5855 "Event.c" +#line 5916 "Event.c" const gchar* _tmp2_; gint _tmp3_; gint _tmp4_; @@ -5864,293 +5925,287 @@ gboolean event_has_name (Event* self) { _tmp4_ = _tmp3_; #line 743 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = _tmp4_ > 0; -#line 5867 "Event.c" +#line 5928 "Event.c" } else { #line 743 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = FALSE; -#line 5871 "Event.c" +#line 5932 "Event.c" } #line 743 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 743 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5877 "Event.c" +#line 5938 "Event.c" } -static gchar* event_real_get_name (DataObject* base) { +static gchar* +event_real_get_name (DataObject* base) +{ Event * self; gchar* result = NULL; - gboolean _tmp0_; gchar* datestring = NULL; - gchar* _tmp2_; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_; - gboolean _tmp5_; + gchar* _tmp1_; + gchar* _tmp2_ = NULL; + const gchar* _tmp3_; #line 746 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 747 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event_has_name (self); -#line 747 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp0_) { -#line 5896 "Event.c" - gchar* _tmp1_; + if (event_has_name (self)) { +#line 5955 "Event.c" + gchar* _tmp0_; #line 748 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_get_raw_name (self); + _tmp0_ = event_get_raw_name (self); #line 748 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = _tmp0_; #line 748 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5904 "Event.c" +#line 5963 "Event.c" } #line 751 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_get_formatted_daterange (self); + _tmp1_ = event_get_formatted_daterange (self); #line 751 "/home/jens/Source/shotwell/src/Event.vala" - datestring = _tmp2_; + datestring = _tmp1_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = datestring; + _tmp3_ = datestring; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = is_string_empty (_tmp4_); -#line 753 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp5_) { -#line 5916 "Event.c" - const gchar* _tmp6_; - gchar* _tmp7_; + if (!is_string_empty (_tmp3_)) { +#line 5973 "Event.c" + const gchar* _tmp4_; + gchar* _tmp5_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = datestring; + _tmp4_ = datestring; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp5_ = g_strdup (_tmp4_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp7_; -#line 5927 "Event.c" + _tmp2_ = _tmp5_; +#line 5984 "Event.c" } else { - EventID _tmp8_; - gint64 _tmp9_; + EventID _tmp6_; + gint64 _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = self->priv->event_id; + _tmp6_ = self->priv->event_id; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_.id; + _tmp7_ = _tmp6_.id; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp9_); + _tmp8_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp7_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = g_strdup_printf (_ ("Event %s"), _tmp11_); + _tmp10_ = g_strdup_printf (_ ("Event %s"), _tmp9_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = _tmp12_; + _tmp2_ = _tmp10_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp11_); -#line 5950 "Event.c" + _g_free0 (_tmp9_); +#line 6007 "Event.c" } #line 753 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp3_; + result = _tmp2_; #line 753 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (datestring); #line 753 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 5958 "Event.c" +#line 6015 "Event.c" } -gchar* event_get_formatted_daterange (Event* self) { +gchar* +event_get_formatted_daterange (Event* self) +{ gchar* result = NULL; time_t start_time = 0; - time_t _tmp0_; time_t end_time = 0; + gboolean _tmp0_ = FALSE; time_t _tmp1_; - gboolean _tmp2_ = FALSE; - time_t _tmp3_; - gboolean _tmp5_ = FALSE; - time_t _tmp6_; + gboolean _tmp3_ = FALSE; + time_t _tmp4_; struct tm start = {0}; + time_t _tmp9_; + struct tm _tmp10_ = {0}; + struct tm end = {0}; time_t _tmp11_; struct tm _tmp12_ = {0}; - struct tm end = {0}; - time_t _tmp13_; - struct tm _tmp14_ = {0}; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; + gboolean _tmp13_ = FALSE; + gboolean _tmp14_ = FALSE; + struct tm _tmp15_; + gint _tmp16_; struct tm _tmp17_; gint _tmp18_; - struct tm _tmp19_; - gint _tmp20_; - struct tm _tmp32_; - struct tm _tmp33_; - gchar* _tmp34_; + struct tm _tmp30_; + struct tm _tmp31_; + gchar* _tmp32_; #line 756 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), NULL); #line 757 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); -#line 757 "/home/jens/Source/shotwell/src/Event.vala" - start_time = _tmp0_; + start_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); #line 758 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_source_get_end_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); -#line 758 "/home/jens/Source/shotwell/src/Event.vala" - end_time = _tmp1_; + end_time = event_source_get_end_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource)); #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = end_time; + _tmp1_ = end_time; #line 760 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ == ((time_t) 0)) { -#line 6001 "Event.c" - time_t _tmp4_; + if (_tmp1_ == ((time_t) 0)) { +#line 6054 "Event.c" + time_t _tmp2_; #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = start_time; + _tmp2_ = start_time; #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp4_ == ((time_t) 0); -#line 6007 "Event.c" + _tmp0_ = _tmp2_ == ((time_t) 0); +#line 6060 "Event.c" } else { #line 760 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; -#line 6011 "Event.c" + _tmp0_ = FALSE; +#line 6064 "Event.c" } #line 760 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_) { + if (_tmp0_) { #line 761 "/home/jens/Source/shotwell/src/Event.vala" result = NULL; #line 761 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6019 "Event.c" +#line 6072 "Event.c" } #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = end_time; + _tmp4_ = end_time; #line 763 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp6_ == ((time_t) 0)) { -#line 6025 "Event.c" - time_t _tmp7_; + if (_tmp4_ == ((time_t) 0)) { +#line 6078 "Event.c" + time_t _tmp5_; #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = start_time; + _tmp5_ = start_time; #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = _tmp7_ != ((time_t) 0); -#line 6031 "Event.c" + _tmp3_ = _tmp5_ != ((time_t) 0); +#line 6084 "Event.c" } else { #line 763 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = FALSE; -#line 6035 "Event.c" + _tmp3_ = FALSE; +#line 6088 "Event.c" } #line 763 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_) { -#line 6039 "Event.c" - time_t _tmp8_; - struct tm _tmp9_ = {0}; - gchar* _tmp10_; + if (_tmp3_) { +#line 6092 "Event.c" + time_t _tmp6_; + struct tm _tmp7_ = {0}; + gchar* _tmp8_; #line 764 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = start_time; + _tmp6_ = start_time; #line 764 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp8_, &_tmp9_); + g_time_local (_tmp6_, &_tmp7_); #line 764 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = format_local_date (&_tmp9_); + _tmp8_ = format_local_date (&_tmp7_); #line 764 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = _tmp8_; #line 764 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6053 "Event.c" +#line 6106 "Event.c" } #line 766 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = start_time; + _tmp9_ = start_time; #line 766 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp11_, &_tmp12_); + g_time_local (_tmp9_, &_tmp10_); #line 766 "/home/jens/Source/shotwell/src/Event.vala" - start = _tmp12_; + start = _tmp10_; #line 767 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = end_time; + _tmp11_ = end_time; #line 767 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp13_, &_tmp14_); + g_time_local (_tmp11_, &_tmp12_); #line 767 "/home/jens/Source/shotwell/src/Event.vala" - end = _tmp14_; + end = _tmp12_; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = start; + _tmp15_ = start; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = _tmp17_.tm_mday; + _tmp16_ = _tmp15_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = end; + _tmp17_ = end; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp20_ = _tmp19_.tm_mday; + _tmp18_ = _tmp17_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp18_ == _tmp20_) { -#line 6077 "Event.c" + if (_tmp16_ == _tmp18_) { +#line 6130 "Event.c" + struct tm _tmp19_; + gint _tmp20_; struct tm _tmp21_; gint _tmp22_; - struct tm _tmp23_; - gint _tmp24_; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp21_ = start; + _tmp19_ = start; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp22_ = _tmp21_.tm_mon; + _tmp20_ = _tmp19_.tm_mon; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp23_ = end; + _tmp21_ = end; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp24_ = _tmp23_.tm_mon; + _tmp22_ = _tmp21_.tm_mon; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = _tmp22_ == _tmp24_; -#line 6092 "Event.c" + _tmp14_ = _tmp20_ == _tmp22_; +#line 6145 "Event.c" } else { #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = FALSE; -#line 6096 "Event.c" + _tmp14_ = FALSE; +#line 6149 "Event.c" } #line 769 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp16_) { -#line 6100 "Event.c" + if (_tmp14_) { +#line 6153 "Event.c" + struct tm _tmp23_; + gint _tmp24_; struct tm _tmp25_; gint _tmp26_; - struct tm _tmp27_; - gint _tmp28_; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp25_ = start; + _tmp23_ = start; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp26_ = _tmp25_.tm_mday; + _tmp24_ = _tmp23_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp27_ = end; + _tmp25_ = end; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp28_ = _tmp27_.tm_mday; + _tmp26_ = _tmp25_.tm_mday; #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _tmp26_ == _tmp28_; -#line 6115 "Event.c" + _tmp13_ = _tmp24_ == _tmp26_; +#line 6168 "Event.c" } else { #line 769 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = FALSE; -#line 6119 "Event.c" + _tmp13_ = FALSE; +#line 6172 "Event.c" } #line 769 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp15_) { -#line 6123 "Event.c" - time_t _tmp29_; - struct tm _tmp30_ = {0}; - gchar* _tmp31_; + if (_tmp13_) { +#line 6176 "Event.c" + time_t _tmp27_; + struct tm _tmp28_ = {0}; + gchar* _tmp29_; #line 770 "/home/jens/Source/shotwell/src/Event.vala" - _tmp29_ = start_time; + _tmp27_ = start_time; #line 770 "/home/jens/Source/shotwell/src/Event.vala" - g_time_local (_tmp29_, &_tmp30_); + g_time_local (_tmp27_, &_tmp28_); #line 770 "/home/jens/Source/shotwell/src/Event.vala" - _tmp31_ = format_local_date (&_tmp30_); + _tmp29_ = format_local_date (&_tmp28_); #line 770 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp31_; + result = _tmp29_; #line 770 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6137 "Event.c" +#line 6190 "Event.c" } #line 772 "/home/jens/Source/shotwell/src/Event.vala" - _tmp32_ = start; + _tmp30_ = start; #line 772 "/home/jens/Source/shotwell/src/Event.vala" - _tmp33_ = end; + _tmp31_ = end; #line 772 "/home/jens/Source/shotwell/src/Event.vala" - _tmp34_ = format_local_datespan (&_tmp32_, &_tmp33_); + _tmp32_ = format_local_datespan (&_tmp30_, &_tmp31_); #line 772 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp34_; + result = _tmp32_; #line 772 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6149 "Event.c" +#line 6202 "Event.c" } -gchar* event_get_raw_name (Event* self) { +gchar* +event_get_raw_name (Event* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -6164,11 +6219,13 @@ gchar* event_get_raw_name (Event* self) { result = _tmp1_; #line 776 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6167 "Event.c" +#line 6222 "Event.c" } -static gchar* event_real_get_comment (EventSource* base) { +static gchar* +event_real_get_comment (EventSource* base) +{ Event * self; gchar* result = NULL; const gchar* _tmp0_; @@ -6183,93 +6240,90 @@ static gchar* event_real_get_comment (EventSource* base) { result = _tmp1_; #line 780 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6186 "Event.c" +#line 6243 "Event.c" } -gboolean event_rename (Event* self, const gchar* name) { +gboolean +event_rename (Event* self, + const gchar* name) +{ gboolean result = FALSE; gchar* new_name = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_; - gchar* _tmp4_; - gboolean _tmp5_; + gboolean _tmp4_; gboolean renamed = FALSE; - EventTable* _tmp7_; - EventID _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gboolean _tmp11_; + EventTable* _tmp6_; + EventID _tmp7_; + const gchar* _tmp8_; + gboolean _tmp9_; #line 783 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 784 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = name; -#line 784 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = event_prep_event_name (_tmp0_); + _tmp0_ = event_prep_event_name (name); #line 784 "/home/jens/Source/shotwell/src/Event.vala" - new_name = _tmp1_; + new_name = _tmp0_; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = new_name; + _tmp1_ = new_name; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_get_formatted_daterange (self); + _tmp2_ = event_get_formatted_daterange (self); #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = g_strcmp0 (_tmp2_, _tmp4_) == 0; + _tmp4_ = g_strcmp0 (_tmp1_, _tmp3_) == 0; #line 787 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 787 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp5_) { -#line 6225 "Event.c" - gchar* _tmp6_; + if (_tmp4_) { +#line 6281 "Event.c" + gchar* _tmp5_; #line 788 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = g_strdup (""); + _tmp5_ = g_strdup (""); #line 788 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (new_name); #line 788 "/home/jens/Source/shotwell/src/Event.vala" - new_name = _tmp6_; -#line 6233 "Event.c" + new_name = _tmp5_; +#line 6289 "Event.c" } #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event_event_table; + _tmp6_ = event_event_table; #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = self->priv->event_id; + _tmp7_ = self->priv->event_id; #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = new_name; + _tmp8_ = new_name; #line 791 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = event_table_rename (_tmp7_, &_tmp8_, _tmp9_); -#line 791 "/home/jens/Source/shotwell/src/Event.vala" - renamed = _tmp10_; + renamed = event_table_rename (_tmp6_, &_tmp7_, _tmp8_); #line 792 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = renamed; + _tmp9_ = renamed; #line 792 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp11_) { -#line 6249 "Event.c" - const gchar* _tmp12_; - gchar* _tmp13_; - Alteration* _tmp14_; - Alteration* _tmp15_; + if (_tmp9_) { +#line 6303 "Event.c" + const gchar* _tmp10_; + gchar* _tmp11_; + Alteration* _tmp12_; + Alteration* _tmp13_; #line 793 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = new_name; + _tmp10_ = new_name; #line 793 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp11_ = g_strdup (_tmp10_); #line 793 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->raw_name); #line 793 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->raw_name = _tmp13_; + self->priv->raw_name = _tmp11_; #line 794 "/home/jens/Source/shotwell/src/Event.vala" event_update_indexable_keywords (self); #line 795 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = alteration_new_from_list ("metadata:name, indexable:keywords"); + _tmp12_ = alteration_new_from_list ("metadata:name, indexable:keywords"); #line 795 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 795 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_); #line 795 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp15_); -#line 6272 "Event.c" + _alteration_unref0 (_tmp13_); +#line 6326 "Event.c" } #line 798 "/home/jens/Source/shotwell/src/Event.vala" result = renamed; @@ -6277,68 +6331,65 @@ gboolean event_rename (Event* self, const gchar* name) { _g_free0 (new_name); #line 798 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6280 "Event.c" +#line 6334 "Event.c" } -static gboolean event_real_set_comment (EventSource* base, const gchar* comment) { +static gboolean +event_real_set_comment (EventSource* base, + const gchar* comment) +{ Event * self; gboolean result = FALSE; gchar* new_comment = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; gboolean committed = FALSE; - EventTable* _tmp2_; - EventID _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; - gboolean _tmp6_; + EventTable* _tmp1_; + EventID _tmp2_; + const gchar* _tmp3_; + gboolean _tmp4_; #line 801 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 802 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = comment; -#line 802 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = media_source_prep_comment (_tmp0_); + _tmp0_ = media_source_prep_comment (comment); #line 802 "/home/jens/Source/shotwell/src/Event.vala" - new_comment = _tmp1_; + new_comment = _tmp0_; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_event_table; + _tmp1_ = event_event_table; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = self->priv->event_id; + _tmp2_ = self->priv->event_id; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = new_comment; + _tmp3_ = new_comment; #line 804 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_table_set_comment (_tmp2_, &_tmp3_, _tmp4_); -#line 804 "/home/jens/Source/shotwell/src/Event.vala" - committed = _tmp5_; + committed = event_table_set_comment (_tmp1_, &_tmp2_, _tmp3_); #line 805 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = committed; + _tmp4_ = committed; #line 805 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp6_) { -#line 6318 "Event.c" - const gchar* _tmp7_; - gchar* _tmp8_; - Alteration* _tmp9_; - Alteration* _tmp10_; + if (_tmp4_) { +#line 6369 "Event.c" + const gchar* _tmp5_; + gchar* _tmp6_; + Alteration* _tmp7_; + Alteration* _tmp8_; #line 806 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = new_comment; + _tmp5_ = new_comment; #line 806 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp6_ = g_strdup (_tmp5_); #line 806 "/home/jens/Source/shotwell/src/Event.vala" _g_free0 (self->priv->comment); #line 806 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->comment = _tmp8_; + self->priv->comment = _tmp6_; #line 807 "/home/jens/Source/shotwell/src/Event.vala" event_update_indexable_keywords (self); #line 808 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = alteration_new_from_list ("metadata:comment, indexable:keywords"); + _tmp7_ = alteration_new_from_list ("metadata:comment, indexable:keywords"); #line 808 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 808 "/home/jens/Source/shotwell/src/Event.vala" - data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_); + data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp8_); #line 808 "/home/jens/Source/shotwell/src/Event.vala" - _alteration_unref0 (_tmp10_); -#line 6341 "Event.c" + _alteration_unref0 (_tmp8_); +#line 6392 "Event.c" } #line 811 "/home/jens/Source/shotwell/src/Event.vala" result = committed; @@ -6346,15 +6397,16 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment) _g_free0 (new_comment); #line 811 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6349 "Event.c" +#line 6400 "Event.c" } -time_t event_get_creation_time (Event* self) { +time_t +event_get_creation_time (Event* self) +{ time_t result = 0; EventTable* _tmp0_; EventID _tmp1_; - time_t _tmp2_; #line 814 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), 0); #line 815 "/home/jens/Source/shotwell/src/Event.vala" @@ -6362,107 +6414,101 @@ time_t event_get_creation_time (Event* self) { #line 815 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = self->priv->event_id; #line 815 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event_table_get_time_created (_tmp0_, &_tmp1_); -#line 815 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp2_; + result = event_table_get_time_created (_tmp0_, &_tmp1_); #line 815 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6370 "Event.c" +#line 6420 "Event.c" } -static time_t event_real_get_start_time (EventSource* base) { +static time_t +event_real_get_start_time (EventSource* base) +{ Event * self; time_t result = 0; gint count = 0; ViewCollection* _tmp0_; - gint _tmp1_; #line 818 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 821 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 821 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 821 "/home/jens/Source/shotwell/src/Event.vala" - count = _tmp1_; -#line 6388 "Event.c" + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); +#line 6437 "Event.c" { gint i = 0; #line 822 "/home/jens/Source/shotwell/src/Event.vala" i = 0; -#line 6393 "Event.c" +#line 6442 "Event.c" { - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = TRUE; + _tmp1_ = TRUE; #line 822 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 6400 "Event.c" +#line 6449 "Event.c" + gint _tmp3_; gint _tmp4_; - gint _tmp5_; time_t time = 0; - ViewCollection* _tmp6_; - gint _tmp7_; - DataObject* _tmp8_; - DataView* _tmp9_; - DataSource* _tmp10_; - MediaSource* _tmp11_; + ViewCollection* _tmp5_; + gint _tmp6_; + DataObject* _tmp7_; + DataView* _tmp8_; + DataSource* _tmp9_; + MediaSource* _tmp10_; + time_t _tmp11_; time_t _tmp12_; - time_t _tmp13_; - time_t _tmp14_; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp2_) { -#line 6415 "Event.c" - gint _tmp3_; + if (!_tmp1_) { +#line 6463 "Event.c" + gint _tmp2_; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = i; + _tmp2_ = i; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - i = _tmp3_ + 1; -#line 6421 "Event.c" + i = _tmp2_ + 1; +#line 6469 "Event.c" } #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; + _tmp1_ = FALSE; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = i; + _tmp3_ = i; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = count; + _tmp4_ = count; #line 822 "/home/jens/Source/shotwell/src/Event.vala" - if (!(_tmp4_ < _tmp5_)) { + if (!(_tmp3_ < _tmp4_)) { #line 822 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 6433 "Event.c" +#line 6481 "Event.c" } #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = self->priv->view; + _tmp5_ = self->priv->view; #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = i; + _tmp6_ = i; #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_); + _tmp7_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView); + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = data_view_get_source (_tmp9_); + _tmp9_ = data_view_get_source (_tmp8_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = media_source_get_exposure_time (_tmp11_); + _tmp11_ = media_source_get_exposure_time (_tmp10_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = _tmp12_; + _g_object_unref0 (_tmp10_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp8_); #line 823 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp9_); -#line 823 "/home/jens/Source/shotwell/src/Event.vala" - time = _tmp13_; + time = _tmp11_; #line 824 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = time; + _tmp12_ = time; #line 824 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp14_ != ((time_t) 0)) { + if (_tmp12_ != ((time_t) 0)) { #line 825 "/home/jens/Source/shotwell/src/Event.vala" result = time; #line 825 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6465 "Event.c" +#line 6511 "Event.c" } } } @@ -6471,72 +6517,70 @@ static time_t event_real_get_start_time (EventSource* base) { result = (time_t) 0; #line 828 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6474 "Event.c" +#line 6520 "Event.c" } -static time_t event_real_get_end_time (EventSource* base) { +static time_t +event_real_get_end_time (EventSource* base) +{ Event * self; time_t result = 0; gint count = 0; ViewCollection* _tmp0_; gint _tmp1_; - gint _tmp2_; - ViewCollection* _tmp3_; - gint _tmp4_; - DataObject* _tmp5_; - DataView* _tmp6_; - DataSource* _tmp7_; - MediaSource* _tmp8_; - time_t _tmp9_; - time_t _tmp10_; + ViewCollection* _tmp2_; + gint _tmp3_; + DataObject* _tmp4_; + DataView* _tmp5_; + DataSource* _tmp6_; + MediaSource* _tmp7_; + time_t _tmp8_; #line 831 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 832 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 832 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 832 "/home/jens/Source/shotwell/src/Event.vala" - count = _tmp1_; + count = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 836 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = count; + _tmp1_ = count; #line 836 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_ == 0) { + if (_tmp1_ == 0) { #line 837 "/home/jens/Source/shotwell/src/Event.vala" result = (time_t) 0; #line 837 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6509 "Event.c" +#line 6553 "Event.c" } #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = self->priv->view; -#line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = count; + _tmp2_ = self->priv->view; #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp4_ - 1); + _tmp3_ = count; #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView); + _tmp4_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), _tmp3_ - 1); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = data_view_get_source (_tmp6_); + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_VIEW, DataView); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp6_ = data_view_get_source (_tmp5_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = media_source_get_exposure_time (_tmp8_); + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = _tmp9_; + _tmp8_ = media_source_get_exposure_time (_tmp7_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp6_); + _g_object_unref0 (_tmp5_); #line 839 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp10_; + result = _tmp8_; #line 839 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6535 "Event.c" +#line 6577 "Event.c" } -static guint64 event_real_get_total_filesize (EventSource* base) { +static guint64 +event_real_get_total_filesize (EventSource* base) +{ Event * self; guint64 result = 0ULL; guint64 total = 0ULL; @@ -6544,7 +6588,7 @@ static guint64 event_real_get_total_filesize (EventSource* base) { self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 843 "/home/jens/Source/shotwell/src/Event.vala" total = (guint64) 0; -#line 6547 "Event.c" +#line 6591 "Event.c" { GeeIterator* _current_source_it = NULL; GeeCollection* _tmp0_; @@ -6565,75 +6609,70 @@ static guint64 event_real_get_total_filesize (EventSource* base) { _current_source_it = _tmp3_; #line 844 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 6568 "Event.c" +#line 6612 "Event.c" GeeIterator* _tmp4_; - gboolean _tmp5_; MediaSource* current_source = NULL; - GeeIterator* _tmp6_; - gpointer _tmp7_; - guint64 _tmp8_; - MediaSource* _tmp9_; - guint64 _tmp10_; + GeeIterator* _tmp5_; + gpointer _tmp6_; + guint64 _tmp7_; + MediaSource* _tmp8_; #line 844 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = _current_source_it; #line 844 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = gee_iterator_next (_tmp4_); -#line 844 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp5_) { + if (!gee_iterator_next (_tmp4_)) { #line 844 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 6585 "Event.c" +#line 6625 "Event.c" } #line 844 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = _current_source_it; + _tmp5_ = _current_source_it; #line 844 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = gee_iterator_get (_tmp6_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 844 "/home/jens/Source/shotwell/src/Event.vala" - current_source = (MediaSource*) _tmp7_; -#line 845 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = total; + current_source = (MediaSource*) _tmp6_; #line 845 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = current_source; + _tmp7_ = total; #line 845 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = media_source_get_filesize (_tmp9_); + _tmp8_ = current_source; #line 845 "/home/jens/Source/shotwell/src/Event.vala" - total = _tmp8_ + _tmp10_; + total = _tmp7_ + media_source_get_filesize (_tmp8_); #line 844 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (current_source); -#line 6603 "Event.c" +#line 6641 "Event.c" } #line 844 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_current_source_it); -#line 6607 "Event.c" +#line 6645 "Event.c" } #line 848 "/home/jens/Source/shotwell/src/Event.vala" result = total; #line 848 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6613 "Event.c" +#line 6651 "Event.c" } -static gint event_real_get_media_count (EventSource* base) { +static gint +event_real_get_media_count (EventSource* base) +{ Event * self; gint result = 0; ViewCollection* _tmp0_; - gint _tmp1_; #line 851 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event); #line 852 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 852 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 852 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp1_; + result = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); #line 852 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6632 "Event.c" +#line 6669 "Event.c" } -static GeeCollection* event_real_get_media (EventSource* base) { +static GeeCollection* +event_real_get_media (EventSource* base) +{ Event * self; GeeCollection* result = NULL; ViewCollection* _tmp0_; @@ -6648,43 +6687,43 @@ static GeeCollection* event_real_get_media (EventSource* base) { result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); #line 856 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6651 "Event.c" +#line 6690 "Event.c" } -void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target) { +void +event_mirror_photos (Event* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target) +{ ViewCollection* _tmp0_; - ViewCollection* _tmp1_; - CreateView _tmp2_; - void* _tmp2__target; #line 859 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 859 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_VIEW_COLLECTION (view)); #line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = view; -#line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = self->priv->view; -#line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = mirroring_ctor; -#line 860 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2__target = mirroring_ctor_target; + _tmp0_ = self->priv->view; #line 860 "/home/jens/Source/shotwell/src/Event.vala" - view_collection_mirror (_tmp0_, _tmp1_, _tmp2_, _tmp2__target, NULL, NULL); -#line 6674 "Event.c" + view_collection_mirror (view, _tmp0_, mirroring_ctor, mirroring_ctor_target, NULL, NULL); +#line 6709 "Event.c" } -static void event_on_primary_thumbnail_altered (Event* self) { +static void +event_on_primary_thumbnail_altered (Event* self) +{ #line 863 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_EVENT (self)); #line 864 "/home/jens/Source/shotwell/src/Event.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 6683 "Event.c" +#line 6720 "Event.c" } -MediaSource* event_get_primary_source (Event* self) { +MediaSource* +event_get_primary_source (Event* self) +{ MediaSource* result = NULL; MediaSource* _tmp0_; MediaSource* _tmp1_; @@ -6698,24 +6737,23 @@ MediaSource* event_get_primary_source (Event* self) { result = _tmp1_; #line 868 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6701 "Event.c" +#line 6740 "Event.c" } -gboolean event_set_primary_source (Event* self, MediaSource* source) { +gboolean +event_set_primary_source (Event* self, + MediaSource* source) +{ gboolean result = FALSE; ViewCollection* _tmp0_; - MediaSource* _tmp1_; - gboolean _tmp2_; gboolean committed = FALSE; - EventTable* _tmp3_; - EventID _tmp4_; - MediaSource* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; - gboolean _tmp10_; + EventTable* _tmp1_; + EventID _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; #line 871 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), FALSE); #line 871 "/home/jens/Source/shotwell/src/Event.vala" @@ -6723,78 +6761,69 @@ gboolean event_set_primary_source (Event* self, MediaSource* source) { #line 872 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = self->priv->view; #line 872 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = source; -#line 872 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = view_collection_has_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource)); -#line 872 "/home/jens/Source/shotwell/src/Event.vala" - _vala_assert (_tmp2_, "view.has_view_for_source(source)"); + _vala_assert (view_collection_has_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)), "view.has_view_for_source(source)"); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_event_table; + _tmp1_ = event_event_table; #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->event_id; + _tmp2_ = self->priv->event_id; #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = source; + _tmp3_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource)); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource)); -#line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = _tmp6_; -#line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_table_set_primary_source_id (_tmp3_, &_tmp4_, _tmp7_); + _tmp4_ = _tmp3_; #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp5_ = event_table_set_primary_source_id (_tmp1_, &_tmp2_, _tmp4_); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp4_); #line 874 "/home/jens/Source/shotwell/src/Event.vala" - committed = _tmp9_; + committed = _tmp5_; #line 875 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = committed; + _tmp6_ = committed; #line 875 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp10_) { -#line 6753 "Event.c" + if (_tmp6_) { +#line 6783 "Event.c" + MediaSource* _tmp7_; + MediaSource* _tmp10_; MediaSource* _tmp11_; - MediaSource* _tmp14_; - MediaSource* _tmp15_; - MediaSource* _tmp16_; #line 877 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = self->priv->primary_source; + _tmp7_ = self->priv->primary_source; #line 877 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp11_ != NULL) { -#line 6762 "Event.c" - MediaSource* _tmp12_; - guint _tmp13_; + if (_tmp7_ != NULL) { +#line 6791 "Event.c" + MediaSource* _tmp8_; + guint _tmp9_; #line 878 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = self->priv->primary_source; + _tmp8_ = self->priv->primary_source; #line 878 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp13_, NULL, FALSE); + g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp9_, NULL, FALSE); #line 878 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self); -#line 6771 "Event.c" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self); +#line 6800 "Event.c" } #line 880 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = source; -#line 880 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = _g_object_ref0 (_tmp14_); + _tmp10_ = _g_object_ref0 (source); #line 880 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 880 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = _tmp15_; + self->priv->primary_source = _tmp10_; #line 881 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = self->priv->primary_source; + _tmp11_ = self->priv->primary_source; #line 881 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0); #line 883 "/home/jens/Source/shotwell/src/Event.vala" thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource)); -#line 6787 "Event.c" +#line 6814 "Event.c" } #line 886 "/home/jens/Source/shotwell/src/Event.vala" result = committed; #line 886 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6793 "Event.c" +#line 6820 "Event.c" } -static void event_release_primary_source (Event* self) { +static void +event_release_primary_source (Event* self) +{ MediaSource* _tmp0_; MediaSource* _tmp1_; guint _tmp2_; @@ -6806,7 +6835,7 @@ static void event_release_primary_source (Event* self) { if (_tmp0_ == NULL) { #line 891 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 6809 "Event.c" +#line 6838 "Event.c" } #line 893 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = self->priv->primary_source; @@ -6818,11 +6847,15 @@ static void event_release_primary_source (Event* self) { _g_object_unref0 (self->priv->primary_source); #line 894 "/home/jens/Source/shotwell/src/Event.vala" self->priv->primary_source = NULL; -#line 6821 "Event.c" +#line 6850 "Event.c" } -static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +event_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ Event * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -6834,20 +6867,17 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G _tmp1_ = self->priv->primary_source; #line 898 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp1_ != NULL) { -#line 6837 "Event.c" +#line 6870 "Event.c" MediaSource* _tmp2_; - gint _tmp3_; - GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp3_; #line 898 "/home/jens/Source/shotwell/src/Event.vala" _tmp2_ = self->priv->primary_source; #line 898 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = scale; -#line 898 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, &_inner_error_); + _tmp3_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = _tmp4_; + _tmp0_ = _tmp3_; #line 898 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 898 "/home/jens/Source/shotwell/src/Event.vala" @@ -6856,31 +6886,34 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G _g_object_unref0 (_tmp0_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 6859 "Event.c" +#line 6889 "Event.c" } } else { #line 898 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_tmp0_); #line 898 "/home/jens/Source/shotwell/src/Event.vala" _tmp0_ = NULL; -#line 6866 "Event.c" +#line 6896 "Event.c" } #line 898 "/home/jens/Source/shotwell/src/Event.vala" result = _tmp0_; #line 898 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6872 "Event.c" +#line 6902 "Event.c" } -GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { +GdkPixbuf* +event_get_preview_pixbuf (Event* self, + Scaling* scaling) +{ GdkPixbuf* result = NULL; GError * _inner_error_ = NULL; #line 901 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (self), NULL); #line 901 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 6883 "Event.c" +#line 6916 "Event.c" { GdkPixbuf* _tmp0_ = NULL; MediaSource* _tmp1_; @@ -6905,7 +6938,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { _tmp0_ = _tmp5_; #line 903 "/home/jens/Source/shotwell/src/Event.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6908 "Event.c" +#line 6941 "Event.c" goto __catch450_g_error; } #line 903 "/home/jens/Source/shotwell/src/Event.vala" @@ -6918,7 +6951,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { _g_object_unref0 (_tmp0_); #line 903 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6921 "Event.c" +#line 6954 "Event.c" } goto __finally450; __catch450_g_error: @@ -6934,7 +6967,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { _g_error_free0 (err); #line 905 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 6937 "Event.c" +#line 6970 "Event.c" } __finally450: #line 902 "/home/jens/Source/shotwell/src/Event.vala" @@ -6943,11 +6976,13 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) { g_clear_error (&_inner_error_); #line 902 "/home/jens/Source/shotwell/src/Event.vala" return NULL; -#line 6946 "Event.c" +#line 6979 "Event.c" } -static void event_real_destroy (DataSource* base) { +static void +event_real_destroy (DataSource* base) +{ Event * self; ViewCollection* _tmp0_; PhotoTable* _tmp4_; @@ -6963,7 +6998,7 @@ static void event_real_destroy (DataSource* base) { _tmp0_ = self->priv->view; #line 911 "/home/jens/Source/shotwell/src/Event.vala" view_collection_halt_all_monitoring (_tmp0_); -#line 6966 "Event.c" +#line 7001 "Event.c" { EventTable* _tmp1_; EventID _tmp2_; @@ -6977,7 +7012,7 @@ static void event_real_destroy (DataSource* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 915 "/home/jens/Source/shotwell/src/Event.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6980 "Event.c" +#line 7015 "Event.c" goto __catch451_database_error; } #line 915 "/home/jens/Source/shotwell/src/Event.vala" @@ -6986,7 +7021,7 @@ static void event_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 915 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 6989 "Event.c" +#line 7024 "Event.c" } } goto __finally451; @@ -7004,7 +7039,7 @@ static void event_real_destroy (DataSource* base) { app_window_database_error (_tmp3_); #line 914 "/home/jens/Source/shotwell/src/Event.vala" _g_error_free0 (err); -#line 7007 "Event.c" +#line 7042 "Event.c" } __finally451: #line 914 "/home/jens/Source/shotwell/src/Event.vala" @@ -7015,7 +7050,7 @@ static void event_real_destroy (DataSource* base) { g_clear_error (&_inner_error_); #line 914 "/home/jens/Source/shotwell/src/Event.vala" return; -#line 7018 "Event.c" +#line 7053 "Event.c" } #line 921 "/home/jens/Source/shotwell/src/Event.vala" _tmp4_ = photo_table_get_instance (); @@ -7039,28 +7074,33 @@ static void event_real_destroy (DataSource* base) { _database_table_unref0 (_tmp8_); #line 924 "/home/jens/Source/shotwell/src/Event.vala" DATA_SOURCE_CLASS (event_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource)); -#line 7042 "Event.c" +#line 7077 "Event.c" } -static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) { +static void +_event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, + DataSource* source, + gpointer self) +{ #line 126 "/home/jens/Source/shotwell/src/Event.vala" event_event_snapshot_on_attached_source_destroyed ((EventEventSnapshot*) self, source); -#line 7049 "Event.c" +#line 7088 "Event.c" } -static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Event* event) { +static EventEventSnapshot* +event_event_snapshot_construct (GType object_type, + Event* event) +{ EventEventSnapshot* self = NULL; EventTable* _tmp0_; EventTable* _tmp1_; - Event* _tmp2_; - EventID _tmp3_ = {0}; - EventRow* _tmp4_; - Event* _tmp5_; - MediaSource* _tmp6_; - LibraryPhotoSourceCollection* _tmp18_; - VideoSourceCollection* _tmp19_; + EventID _tmp2_ = {0}; + EventRow* _tmp3_; + MediaSource* _tmp4_; + LibraryPhotoSourceCollection* _tmp14_; + VideoSourceCollection* _tmp15_; #line 110 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 110 "/home/jens/Source/shotwell/src/Event.vala" @@ -7070,116 +7110,112 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev #line 112 "/home/jens/Source/shotwell/src/Event.vala" _tmp1_ = _tmp0_; #line 112 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = event; -#line 112 "/home/jens/Source/shotwell/src/Event.vala" - event_get_event_id (_tmp2_, &_tmp3_); + event_get_event_id (event, &_tmp2_); #line 112 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = event_table_get_row (_tmp1_, &_tmp3_); + _tmp3_ = event_table_get_row (_tmp1_, &_tmp2_); #line 112 "/home/jens/Source/shotwell/src/Event.vala" _event_row_unref0 (self->priv->row); #line 112 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->row = _tmp4_; + self->priv->row = _tmp3_; #line 112 "/home/jens/Source/shotwell/src/Event.vala" _database_table_unref0 (_tmp1_); #line 113 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event; -#line 113 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = event_get_primary_source (_tmp5_); + _tmp4_ = event_get_primary_source (event); #line 113 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (self->priv->primary_source); #line 113 "/home/jens/Source/shotwell/src/Event.vala" - self->priv->primary_source = _tmp6_; -#line 7092 "Event.c" + self->priv->primary_source = _tmp4_; +#line 7128 "Event.c" { GeeIterator* _source_it = NULL; - Event* _tmp7_; - GeeCollection* _tmp8_; - GeeCollection* _tmp9_; - GeeIterator* _tmp10_; - GeeIterator* _tmp11_; -#line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = event; + GeeCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeIterator* _tmp7_; + GeeIterator* _tmp8_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT_SOURCE, EventSource)); + _tmp5_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp11_ = _tmp10_; + _tmp8_ = _tmp7_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp6_); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _source_it = _tmp11_; + _source_it = _tmp8_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" while (TRUE) { -#line 7116 "Event.c" - GeeIterator* _tmp12_; - gboolean _tmp13_; +#line 7149 "Event.c" + GeeIterator* _tmp9_; MediaSource* source = NULL; - GeeIterator* _tmp14_; - gpointer _tmp15_; - GeeArrayList* _tmp16_; - MediaSource* _tmp17_; -#line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp12_ = _source_it; + GeeIterator* _tmp10_; + gpointer _tmp11_; + GeeArrayList* _tmp12_; + MediaSource* _tmp13_; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp13_ = gee_iterator_next (_tmp12_); + _tmp9_ = _source_it; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - if (!_tmp13_) { + if (!gee_iterator_next (_tmp9_)) { #line 118 "/home/jens/Source/shotwell/src/Event.vala" break; -#line 7132 "Event.c" +#line 7162 "Event.c" } #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp14_ = _source_it; + _tmp10_ = _source_it; #line 118 "/home/jens/Source/shotwell/src/Event.vala" - _tmp15_ = gee_iterator_get (_tmp14_); + _tmp11_ = gee_iterator_get (_tmp10_); #line 118 "/home/jens/Source/shotwell/src/Event.vala" - source = (MediaSource*) _tmp15_; + source = (MediaSource*) _tmp11_; #line 119 "/home/jens/Source/shotwell/src/Event.vala" - _tmp16_ = self->priv->attached_sources; + _tmp12_ = self->priv->attached_sources; #line 119 "/home/jens/Source/shotwell/src/Event.vala" - _tmp17_ = source; + _tmp13_ = source; #line 119 "/home/jens/Source/shotwell/src/Event.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); #line 118 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (source); -#line 7148 "Event.c" +#line 7178 "Event.c" } #line 118 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (_source_it); -#line 7152 "Event.c" +#line 7182 "Event.c" } #line 121 "/home/jens/Source/shotwell/src/Event.vala" - _tmp18_ = library_photo_global; + _tmp14_ = library_photo_global; #line 121 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self); #line 122 "/home/jens/Source/shotwell/src/Event.vala" - _tmp19_ = video_global; + _tmp15_ = video_global; #line 122 "/home/jens/Source/shotwell/src/Event.vala" - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self); #line 110 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 7164 "Event.c" +#line 7194 "Event.c" } -static EventEventSnapshot* event_event_snapshot_new (Event* event) { +static EventEventSnapshot* +event_event_snapshot_new (Event* event) +{ #line 110 "/home/jens/Source/shotwell/src/Event.vala" return event_event_snapshot_construct (EVENT_TYPE_EVENT_SNAPSHOT, event); -#line 7171 "Event.c" +#line 7203 "Event.c" } -static gpointer _event_row_ref0 (gpointer self) { +static gpointer +_event_row_ref0 (gpointer self) +{ #line 131 "/home/jens/Source/shotwell/src/Event.vala" return self ? event_row_ref (self) : NULL; -#line 7178 "Event.c" +#line 7212 "Event.c" } -static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) { +static EventRow* +event_event_snapshot_get_row (EventEventSnapshot* self) +{ EventRow* result = NULL; EventRow* _tmp0_; EventRow* _tmp1_; @@ -7193,11 +7229,13 @@ static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) { result = _tmp1_; #line 131 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 7196 "Event.c" +#line 7232 "Event.c" } -static void event_event_snapshot_real_notify_broken (SourceSnapshot* base) { +static void +event_event_snapshot_real_notify_broken (SourceSnapshot* base) +{ EventEventSnapshot * self; EventRow* _tmp0_; GeeArrayList* _tmp1_; @@ -7219,77 +7257,73 @@ static void event_event_snapshot_real_notify_broken (SourceSnapshot* base) { gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 139 "/home/jens/Source/shotwell/src/Event.vala" SOURCE_SNAPSHOT_CLASS (event_event_snapshot_parent_class)->notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 7222 "Event.c" +#line 7260 "Event.c" } -static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, DataSource* source) { +static void +event_event_snapshot_on_attached_source_destroyed (EventEventSnapshot* self, + DataSource* source) +{ MediaSource* media_source = NULL; - DataSource* _tmp0_; - MediaSource* _tmp1_; - gboolean _tmp2_ = FALSE; - MediaSource* _tmp3_; + MediaSource* _tmp0_; + gboolean _tmp1_ = FALSE; + MediaSource* _tmp2_; #line 142 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (EVENT_IS_EVENT_SNAPSHOT (self)); #line 142 "/home/jens/Source/shotwell/src/Event.vala" g_return_if_fail (IS_DATA_SOURCE (source)); #line 143 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = source; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource)); #line 143 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 143 "/home/jens/Source/shotwell/src/Event.vala" - media_source = _tmp1_; + media_source = _tmp0_; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = media_source; + _tmp2_ = media_source; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp3_ != NULL) { -#line 7246 "Event.c" + if (_tmp2_ != NULL) { +#line 7284 "Event.c" + MediaSource* _tmp3_; MediaSource* _tmp4_; - MediaSource* _tmp5_; - gboolean _tmp6_; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = self->priv->primary_source; + _tmp3_ = self->priv->primary_source; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = media_source; + _tmp4_ = media_source; #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource)); -#line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = _tmp6_; -#line 7258 "Event.c" + _tmp1_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource)); +#line 7293 "Event.c" } else { #line 146 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = FALSE; -#line 7262 "Event.c" + _tmp1_ = FALSE; +#line 7297 "Event.c" } #line 146 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp2_) { + if (_tmp1_) { #line 147 "/home/jens/Source/shotwell/src/Event.vala" source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 7268 "Event.c" +#line 7303 "Event.c" } else { - GeeArrayList* _tmp7_; - MediaSource* _tmp8_; - gboolean _tmp9_; -#line 148 "/home/jens/Source/shotwell/src/Event.vala" - _tmp7_ = self->priv->attached_sources; + GeeArrayList* _tmp5_; + MediaSource* _tmp6_; #line 148 "/home/jens/Source/shotwell/src/Event.vala" - _tmp8_ = media_source; + _tmp5_ = self->priv->attached_sources; #line 148 "/home/jens/Source/shotwell/src/Event.vala" - _tmp9_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_); + _tmp6_ = media_source; #line 148 "/home/jens/Source/shotwell/src/Event.vala" - if (_tmp9_) { + if (gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_)) { #line 149 "/home/jens/Source/shotwell/src/Event.vala" source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot)); -#line 7283 "Event.c" +#line 7315 "Event.c" } } #line 142 "/home/jens/Source/shotwell/src/Event.vala" _g_object_unref0 (media_source); -#line 7288 "Event.c" +#line 7320 "Event.c" } -static void event_event_snapshot_class_init (EventEventSnapshotClass * klass) { +static void +event_event_snapshot_class_init (EventEventSnapshotClass * klass) +{ #line 105 "/home/jens/Source/shotwell/src/Event.vala" event_event_snapshot_parent_class = g_type_class_peek_parent (klass); #line 105 "/home/jens/Source/shotwell/src/Event.vala" @@ -7298,11 +7332,13 @@ static void event_event_snapshot_class_init (EventEventSnapshotClass * klass) { g_type_class_add_private (klass, sizeof (EventEventSnapshotPrivate)); #line 105 "/home/jens/Source/shotwell/src/Event.vala" ((SourceSnapshotClass *) klass)->notify_broken = (void (*) (SourceSnapshot *)) event_event_snapshot_real_notify_broken; -#line 7301 "Event.c" +#line 7335 "Event.c" } -static void event_event_snapshot_instance_init (EventEventSnapshot * self) { +static void +event_event_snapshot_instance_init (EventEventSnapshot * self) +{ GeeArrayList* _tmp0_; #line 105 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_EVENT_SNAPSHOT_GET_PRIVATE (self); @@ -7310,11 +7346,13 @@ static void event_event_snapshot_instance_init (EventEventSnapshot * self) { _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 108 "/home/jens/Source/shotwell/src/Event.vala" self->priv->attached_sources = _tmp0_; -#line 7313 "Event.c" +#line 7349 "Event.c" } -static void event_event_snapshot_finalize (SourceSnapshot * obj) { +static void +event_event_snapshot_finalize (SourceSnapshot * obj) +{ EventEventSnapshot * self; LibraryPhotoSourceCollection* _tmp0_; guint _tmp1_; @@ -7342,11 +7380,13 @@ static void event_event_snapshot_finalize (SourceSnapshot * obj) { _g_object_unref0 (self->priv->attached_sources); #line 105 "/home/jens/Source/shotwell/src/Event.vala" SOURCE_SNAPSHOT_CLASS (event_event_snapshot_parent_class)->finalize (obj); -#line 7345 "Event.c" +#line 7383 "Event.c" } -static GType event_event_snapshot_get_type (void) { +static GType +event_event_snapshot_get_type (void) +{ static volatile gsize event_event_snapshot_type_id__volatile = 0; if (g_once_init_enter (&event_event_snapshot_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventEventSnapshotClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_event_snapshot_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventEventSnapshot), 0, (GInstanceInitFunc) event_event_snapshot_instance_init, NULL }; @@ -7358,94 +7398,102 @@ static GType event_event_snapshot_get_type (void) { } -static EventEventProxy* event_event_proxy_construct (GType object_type, Event* event) { +static EventEventProxy* +event_event_proxy_construct (GType object_type, + Event* event) +{ EventEventProxy* self = NULL; - Event* _tmp0_; #line 154 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 155 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = event; -#line 155 "/home/jens/Source/shotwell/src/Event.vala" - self = (EventEventProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource)); + self = (EventEventProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_SOURCE, DataSource)); #line 154 "/home/jens/Source/shotwell/src/Event.vala" return self; -#line 7372 "Event.c" +#line 7412 "Event.c" } -static EventEventProxy* event_event_proxy_new (Event* event) { +static EventEventProxy* +event_event_proxy_new (Event* event) +{ #line 154 "/home/jens/Source/shotwell/src/Event.vala" return event_event_proxy_construct (EVENT_TYPE_EVENT_PROXY, event); -#line 7379 "Event.c" +#line 7421 "Event.c" } -static gpointer _source_snapshot_ref0 (gpointer self) { +static gpointer +_source_snapshot_ref0 (gpointer self) +{ #line 159 "/home/jens/Source/shotwell/src/Event.vala" return self ? source_snapshot_ref (self) : NULL; -#line 7386 "Event.c" +#line 7430 "Event.c" } -static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint64 object_id, SourceSnapshot* snapshot) { +static DataSource* +event_event_proxy_real_reconstitute (SourceProxy* base, + gint64 object_id, + SourceSnapshot* snapshot) +{ EventEventProxy * self; DataSource* result = NULL; EventEventSnapshot* event_snapshot = NULL; - SourceSnapshot* _tmp0_; - EventEventSnapshot* _tmp1_; - gint64 _tmp2_; - EventRow* _tmp3_; - EventRow* _tmp4_; - Event* _tmp5_; - DataSource* _tmp6_; + EventEventSnapshot* _tmp0_; + EventRow* _tmp1_; + EventRow* _tmp2_; + Event* _tmp3_; + DataSource* _tmp4_; #line 158 "/home/jens/Source/shotwell/src/Event.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENT_TYPE_EVENT_PROXY, EventEventProxy); #line 158 "/home/jens/Source/shotwell/src/Event.vala" g_return_val_if_fail (IS_SOURCE_SNAPSHOT (snapshot), NULL); #line 159 "/home/jens/Source/shotwell/src/Event.vala" - _tmp0_ = snapshot; -#line 159 "/home/jens/Source/shotwell/src/Event.vala" - _tmp1_ = _source_snapshot_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EVENT_TYPE_EVENT_SNAPSHOT) ? ((EventEventSnapshot*) _tmp0_) : NULL); + _tmp0_ = _source_snapshot_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (snapshot, EVENT_TYPE_EVENT_SNAPSHOT) ? ((EventEventSnapshot*) snapshot) : NULL); #line 159 "/home/jens/Source/shotwell/src/Event.vala" - event_snapshot = _tmp1_; + event_snapshot = _tmp0_; #line 160 "/home/jens/Source/shotwell/src/Event.vala" _vala_assert (event_snapshot != NULL, "event_snapshot != null"); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp2_ = object_id; + _tmp1_ = event_event_snapshot_get_row (event_snapshot); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp3_ = event_event_snapshot_get_row (event_snapshot); -#line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp5_ = event_reconstitute (_tmp2_, _tmp4_); + _tmp3_ = event_reconstitute (object_id, _tmp2_); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource); + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - _event_row_unref0 (_tmp4_); + _event_row_unref0 (_tmp2_); #line 162 "/home/jens/Source/shotwell/src/Event.vala" - result = _tmp6_; + result = _tmp4_; #line 162 "/home/jens/Source/shotwell/src/Event.vala" _source_snapshot_unref0 (event_snapshot); #line 162 "/home/jens/Source/shotwell/src/Event.vala" return result; -#line 7431 "Event.c" +#line 7473 "Event.c" } -static void event_event_proxy_class_init (EventEventProxyClass * klass) { +static void +event_event_proxy_class_init (EventEventProxyClass * klass) +{ #line 153 "/home/jens/Source/shotwell/src/Event.vala" event_event_proxy_parent_class = g_type_class_peek_parent (klass); #line 153 "/home/jens/Source/shotwell/src/Event.vala" ((SourceProxyClass *) klass)->reconstitute = (DataSource* (*) (SourceProxy *, gint64, SourceSnapshot*)) event_event_proxy_real_reconstitute; -#line 7440 "Event.c" +#line 7484 "Event.c" } -static void event_event_proxy_instance_init (EventEventProxy * self) { +static void +event_event_proxy_instance_init (EventEventProxy * self) +{ } -static GType event_event_proxy_get_type (void) { +static GType +event_event_proxy_get_type (void) +{ static volatile gsize event_event_proxy_type_id__volatile = 0; if (g_once_init_enter (&event_event_proxy_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventEventProxyClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_event_proxy_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventEventProxy), 0, (GInstanceInitFunc) event_event_proxy_instance_init, NULL }; @@ -7457,7 +7505,9 @@ static GType event_event_proxy_get_type (void) { } -static void event_class_init (EventClass * klass) { +static void +event_class_init (EventClass * klass) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" event_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/src/Event.vala" @@ -7502,11 +7552,13 @@ static void event_class_init (EventClass * klass) { ((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) event_real_destroy; #line 94 "/home/jens/Source/shotwell/src/Event.vala" G_OBJECT_CLASS (klass)->finalize = event_finalize; -#line 7505 "Event.c" +#line 7555 "Event.c" } -static void event_container_source_interface_init (ContainerSourceIface * iface) { +static void +event_container_source_interface_init (ContainerSourceIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" event_container_source_parent_iface = g_type_interface_peek_parent (iface); #line 94 "/home/jens/Source/shotwell/src/Event.vala" @@ -7521,29 +7573,35 @@ static void event_container_source_interface_init (ContainerSourceIface * iface) iface->establish_link = (void (*) (ContainerSource *, DataSource*)) event_real_establish_link; #line 94 "/home/jens/Source/shotwell/src/Event.vala" iface->establish_link_many = (void (*) (ContainerSource *, GeeCollection*)) event_real_establish_link_many; -#line 7524 "Event.c" +#line 7576 "Event.c" } -static void event_proxyable_interface_init (ProxyableIface * iface) { +static void +event_proxyable_interface_init (ProxyableIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" event_proxyable_parent_iface = g_type_interface_peek_parent (iface); #line 94 "/home/jens/Source/shotwell/src/Event.vala" iface->get_proxy = (SourceProxy* (*) (Proxyable *)) event_real_get_proxy; -#line 7533 "Event.c" +#line 7587 "Event.c" } -static void event_indexable_interface_init (IndexableIface * iface) { +static void +event_indexable_interface_init (IndexableIface * iface) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" event_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 94 "/home/jens/Source/shotwell/src/Event.vala" iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) event_real_get_indexable_keywords; -#line 7542 "Event.c" +#line 7598 "Event.c" } -static void event_instance_init (Event * self) { +static void +event_instance_init (Event * self) +{ #line 94 "/home/jens/Source/shotwell/src/Event.vala" self->priv = EVENT_GET_PRIVATE (self); #line 175 "/home/jens/Source/shotwell/src/Event.vala" @@ -7554,11 +7612,13 @@ static void event_instance_init (Event * self) { self->priv->indexable_keywords = NULL; #line 178 "/home/jens/Source/shotwell/src/Event.vala" self->priv->comment = NULL; -#line 7557 "Event.c" +#line 7615 "Event.c" } -static void event_finalize (GObject * obj) { +static void +event_finalize (GObject * obj) +{ Event * self; MediaSource* _tmp0_; ViewCollection* _tmp3_; @@ -7577,7 +7637,7 @@ static void event_finalize (GObject * obj) { _tmp0_ = self->priv->primary_source; #line 237 "/home/jens/Source/shotwell/src/Event.vala" if (_tmp0_ != NULL) { -#line 7580 "Event.c" +#line 7640 "Event.c" MediaSource* _tmp1_; guint _tmp2_; #line 238 "/home/jens/Source/shotwell/src/Event.vala" @@ -7586,7 +7646,7 @@ static void event_finalize (GObject * obj) { g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp2_, NULL, FALSE); #line 238 "/home/jens/Source/shotwell/src/Event.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self); -#line 7589 "Event.c" +#line 7649 "Event.c" } #line 240 "/home/jens/Source/shotwell/src/Event.vala" _tmp3_ = self->priv->view; @@ -7630,11 +7690,13 @@ static void event_finalize (GObject * obj) { _g_free0 (self->priv->comment); #line 94 "/home/jens/Source/shotwell/src/Event.vala" G_OBJECT_CLASS (event_parent_class)->finalize (obj); -#line 7633 "Event.c" +#line 7693 "Event.c" } -GType event_get_type (void) { +GType +event_get_type (void) +{ static volatile gsize event_type_id__volatile = 0; if (g_once_init_enter (&event_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Event), 0, (GInstanceInitFunc) event_instance_init, NULL }; @@ -7652,7 +7714,11 @@ GType event_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -7664,7 +7730,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3